diff --git a/src/db_add_language/db_add_language.cpp b/src/db_add_language/db_add_language.cpp
index efcce5c..fa7537a 100644
--- a/src/db_add_language/db_add_language.cpp
+++ b/src/db_add_language/db_add_language.cpp
@@ -19,6 +19,7 @@
 #include <common.h>
 #include <db.h>
 
+#include <Polygon4/DataManager/Database.h>
 #include <Polygon4/DataManager/Localization.h>
 #include <Polygon4/DataManager/Storage.h>
 #include <Polygon4/DataManager/Types.h>
@@ -295,8 +296,9 @@ int main(int argc, char *argv[])
 
     fs::current_path(dir_to_lang_dbs);
 
-    auto storage = polygon4::initStorage(db_fn);
-    storage->load();
+    auto storage = polygon4::initStorage();
+    auto database = std::make_unique<polygon4::Database>(db_fn);
+    storage->load(*database, {});
     kv_resolved = get_kv_resolved(dir_to_lang_dbs, *storage.get());
 
     // to check correctness
diff --git a/src/mmo_extractor/mmo_extractor.cpp b/src/mmo_extractor/mmo_extractor.cpp
index d295e7d..071db1a 100644
--- a/src/mmo_extractor/mmo_extractor.cpp
+++ b/src/mmo_extractor/mmo_extractor.cpp
@@ -30,6 +30,7 @@
 #include <objects.h>
 #include "other.h"
 
+#include <Polygon4/DataManager/Database.h>
 #include <Polygon4/DataManager/Storage.h>
 #include <Polygon4/DataManager/Types.h>
 #include <primitives/filesystem.h>
@@ -328,16 +329,17 @@ int main(int argc, char *argv[])
     else
     {
         bool e = fs::exists(db_path);
-        auto storage = initStorage(db_path.u8string());
+        auto storage = initStorage();
+        auto database = std::make_unique<polygon4::Database>(db_path);
         if (!e)
         {
-            storage->create();
-            storage->save();
+            storage->create(*database);
+            storage->save(*database, {});
         }
-        storage->load();
+        storage->load(*database, {});
         action([&storage, &mapname](const path &, const auto &m) {write_mmo(storage.get(), m, mapname); });
         if (inserted_all)
-            storage->save();
+            storage->save(*database, {});
     }
 
     return 0;