diff --git a/partner-cjk.js b/partner-cjk.js
index 9846059..f42bf3f 100644
--- a/partner-cjk.js
+++ b/partner-cjk.js
@@ -97,7 +97,15 @@ function insertTaskToMongoDb(task) {
     if (!isMongoReady()) { return; }
     
     try {
-        mongodb.collection(config.mongodb.collection).insertOne(task);
+        mongodb.collection(config.mongodb.collection).insertOne(task, function(err, result) {
+            mongodb.collection(config.mongodb.collection).updateOne(
+                {requestId: task.requestId},
+                {
+                    $push: {suppliers: config.globals.gateway_name}
+                }
+                
+            )
+        });
     }
     catch(err) {
         //logger.warn('Exception when inserting document to mongodb', {err: err, task: task});
@@ -108,23 +116,16 @@ function pushResponseToMongoDb(task, response) {
     if (!isMongoReady()) { return; }
     
     try {
-        var rc = null;
-        var message = null;
-        var refnum = null;
+        var lastResponse = {};
         
-        if (response.parsed) {
-            if (response.parsed.rc) { rc = response.parsed.rc; };
-            if (response.parsed.message) { message = response.parsed.message; };
-            if (response.parsed.refnum) { refnum = response.parsed.refnum; };
+        if (response.parsed && response.parsed.ciwaru) {
+            lastResponse = response.parsed.ciwaru;
         }
 
         mongodb.collection(config.mongodb.collection).updateOne(
             {requestId: task.requestId},
             {
-                rc: rc,
-                message: message,
-                refnum: refnum,
-                
+                lastResponse: lastResponse,
                 $push: {responses: response}
             },
             function(err, result) {