diff --git a/src/appcommands.cpp b/src/appcommands.cpp
index 5aecea7..a6cbc5e 100644
--- a/src/appcommands.cpp
+++ b/src/appcommands.cpp
@@ -44,7 +44,7 @@
 // TODO: Need to store this info after identifying proper storage
 static uint8_t globEna = 0x09;
 static SysInfoParam sysInfoParams;
-nlohmann::json appData;
+nlohmann::json appData __attribute__((init_priority(101)));
 
 void printGUID(uint8_t *guid, off_t offset)
 {
@@ -242,8 +242,9 @@
 
 void flush_app_data()
 {
-    std::ofstream file(JSON_DATA_FILE);
+    std::ofstream file(JSON_APP_DATA_FILE);
     file << appData;
+    file.close();
     return;
 }
 
@@ -442,9 +443,12 @@
 void registerAPPFunctions()
 {
     /* Get App data stored in json file */
-    std::ifstream file(JSON_DATA_FILE);
+    std::ifstream file(JSON_APP_DATA_FILE);
     if (file)
+    {
         file >> appData;
+        file.close();
+    }
 
     ipmiPrintAndRegister(NETFUN_APP, CMD_APP_GET_SELFTEST_RESULTS, NULL,
                          ipmiAppGetSTResults,