diff --git a/CrestApi/CrestApiFs.h b/CrestApi/CrestApiFs.h
index 743465c3b6eeaf476aa0963deb733dfba6f58fed..754ac8e0b74aa09538054c7bb6f95618ab671092 100644
--- a/CrestApi/CrestApiFs.h
+++ b/CrestApi/CrestApiFs.h
@@ -493,7 +493,7 @@ namespace Crest
  * @param endTime - end time, if endtime = 0, the server does not use this parameter in the internal check.
  */   
     void storePayloadDump(const std::string &tag,
-                          uint64_t since,
+			  long_t since,
                           const std::string &js,
                           const std::string &payloadFormat,
                           const std::string &objectType,
diff --git a/src/CrestApiFs.cxx b/src/CrestApiFs.cxx
index 593cac604af02265066666da88ec97d9df69687c..a1adcf6f476e06af5b356f5ea3c81bb95c10f695 100644
--- a/src/CrestApiFs.cxx
+++ b/src/CrestApiFs.cxx
@@ -685,20 +685,15 @@ namespace Crest
 
     nlohmann::json js_data = storeSetJson.to_json();
 
-    nlohmann::json res;
-    auto it = js_data.find("resources");
-    if (it != js_data.end())
-    {
-      res = js_data["resources"];
-    }
+    std::vector<StoreDto> res = storeSetJson.resources;
 
     try
     {
       for (auto &kvp : res)
       {
-        std::string payload = kvp.value("data", "");
-        int since = kvp.value("since", 0);
-        std::string streamer = kvp.value("streamerInfo", "");
+        std::string payload = kvp.data;
+	long_t since = kvp.since;
+        std::string streamer = kvp.getStreamerInfo().dump();
         // Register everything on the file system.
         storePayloadDump(tag, since, payload, payloadFormat,
                          objectType, compressionType, version, streamer);
@@ -735,7 +730,7 @@ namespace Crest
   }
 
   void CrestFsClient::storePayloadDump(const std::string &tag,
-                                       uint64_t since,
+				       long_t since,
                                        const std::string &js,
                                        const std::string &payloadFormat,
                                        const std::string &objectType,