diff --git a/classes/Map.py b/classes/Map.py
index 4c71b96..4856952 100644
--- a/classes/Map.py
+++ b/classes/Map.py
@@ -28,7 +28,7 @@ class Map:
   def load_from_file(cls, file_options):
     LOGGING.debug(f"Loading from file: {file_options}")
     if os.path.exists(file_options["path"]):
-      with open(file_options["path"], "rb") as f:
+      with open(f'{file_options["path"]}/{file_options["name"]}', "rb") as f:
         data = my_pickle.load(f, file_options['compression'], None)
 
       new_class = cls(file_options["path"])
diff --git a/classes/SavedState.py b/classes/SavedState.py
index f9b8267..a3995e4 100644
--- a/classes/SavedState.py
+++ b/classes/SavedState.py
@@ -52,7 +52,7 @@ class SavedState:
   def load_from_file(cls, file_options):
     LOGGING.debug(f"Loading from file: {file_options}")
     if os.path.exists(file_options["path"]):
-      with open(file_options["path"], "rb") as f:
+      with open(f'{file_options["path"]}/{file_options["name"]}', "rb") as f:
         data = my_pickle.load(f, file_options['compression'], None)
 
       new_class = cls()
diff --git a/config.json b/config.json
index 33cc8a1..2bb83f2 100644
--- a/config.json
+++ b/config.json
@@ -1,13 +1,17 @@
 {
-  "map_file": {
-    "path": "./GameData",
-    "filename": "map.pkl.lzma.encrypted",
-    "encryption_key": ""
-  },
-  "save_file": {
-    "path": "./GameData/Save",
-    "filename": "The-Adventure-AutoSaveGame.pkl.lzma.encrypted",
-    "encryption_key": ""
+  "file": {
+    "map": {
+      "path": "./GameData",
+      "name": "map",
+      "extension": "pkl.lzma.encrypted",
+      "encryption_key": ""
+    },
+    "save": {
+      "path": "./GameData/Save",
+      "name": "The-Adventure-AutoSaveGame",
+      "extension": "pkl.lzma.encrypted",
+      "encryption_key": ""
+    }
   },
 
   "logging": {
diff --git a/my_helpers b/my_helpers
index 5a047d7..77c5712 160000
--- a/my_helpers
+++ b/my_helpers
@@ -1 +1 @@
-Subproject commit 5a047d7e0070a1ac9905dd02fc7fa192785ecfbf
+Subproject commit 77c5712eda3a12e66cf4aa50ed91a31a9bfc7407
diff --git a/run.py b/run.py
index c33d99c..09c7fd4 100644
--- a/run.py
+++ b/run.py
@@ -13,16 +13,8 @@ if __name__ == '__main__':
     logging.basicConfig(filename=f"{CONFIG['logging']['file']['path']}/{CONFIG['logging']['file']['name']}", encoding='utf-8', level=logging.DEBUG)
   LOGGING = logging.getLogger(__name__)
 
-  SAVE_STATE_FILE = {
-    "path": f"{CONFIG['save_file']['path']}/{CONFIG['save_file']['filename']}",
-    "compression": lzma,
-    "key": CONFIG["save_file"]["encryption_key"]
-  }
-  MAP_FILE = {
-    "path": f"{CONFIG['map_file']['path']}/{CONFIG['map_file']['filename']}",
-    "compression": lzma,
-    "key": CONFIG["map_file"]["encryption_key"]
-  }
+  SAVE_STATE_FILE = CONFIG.get_file_path("file/save", add_to_dictionary={"compression": lzma, "key": CONFIG['file']["save"]["encryption_key"]})
+  MAP_FILE = CONFIG.get_file_path("file/map", add_to_dictionary={"compression": lzma, "key": CONFIG['file']["map"]["encryption_key"]})
 
   game_board = GameBoard(CONFIG, SAVE_STATE_FILE, MAP_FILE)
   game_board.find_game_state(store_state=not DEBUG)