diff --git a/partner-cjk.js b/partner-cjk.js
index 2ae537d..7a054e1 100644
--- a/partner-cjk.js
+++ b/partner-cjk.js
@@ -98,19 +98,7 @@ function insertTaskToMongoDb(task) {
     
     try {
         task.suppliers = [];
-        mongodb.collection(config.mongodb.collection).insertOne(task, function(err, result) {
-            
-            /*
-            mongodb.collection(config.mongodb.collection).updateOne(
-                {requestId: task.requestId},
-                {
-                    lastResponse: {},
-                    $push: {suppliers: config.globals.gateway_name}
-                }
-                
-            )
-            */
-        });
+        mongodb.collection(config.mongodb.collection).insertOne(task);
     }
     catch(err) {
         //logger.warn('Exception when inserting document to mongodb', {err: err, task: task});
@@ -124,7 +112,12 @@ function pushResponseToMongoDb(task, response) {
         mongodb.collection(config.mongodb.collection).updateOne(
             {requestId: task.requestId},
             {
-                $push: {responses: response}
+                $set: {
+                    lastResponse: response
+                },
+                $push: {
+                    responses: response
+                }
             },
             function(err, result) {
                 if (err) {
@@ -133,24 +126,6 @@ function pushResponseToMongoDb(task, response) {
                 }
             }
         );
-        
-        /*
-        if (response.parsed && response.parsed.ciwaru) {
-            mongodb.collection(config.mongodb.collection).updateOne(
-                {requestId: task.requestId},
-                {
-                    lastResponse: response.parsed.ciwaru
-                },
-                function(err, result) {
-                    if (err) {
-                        logger.warn('Error when updating last response to mongodb', {err: err, task: task, response: response});
-                        return;
-                    }
-                }
-            );
-        }
-        */
-        
     }
     catch(err) {
         logger.warn('Exception when pushing response to mongodb', {err: err, task: task, response: response});
@@ -224,11 +199,11 @@ function topupResponseHandler(body, task) {
             logger.warn('Got invalid XML from partner', {err: err, body: body, task: task});
             callbackReport(task.requestId, '68', body);
             
-            pushResponseToMongoDb(task, {ts:  ts, raw: body});
+            pushResponseToMongoDb(task, {ts:  ts, supplier: config.globals.gateway_name, raw: body});
             return;
         }
         logger.info('XML message from partner', {result: result});
-        pushResponseToMongoDb(task, {ts:  ts, raw: body, parsed: result});
+        pushResponseToMongoDb(task, {ts:  ts, supplier: config.globals.gateway_name, raw: body, parsed: result});
         
         var rc = '68';
         var message = result.ciwaru.msg[0];