diff --git a/BauSystem_Main/src/de/steamwar/bausystem/BauSystem.java b/BauSystem_Main/src/de/steamwar/bausystem/BauSystem.java
index f3a9f802..291d9aa6 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/BauSystem.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/BauSystem.java
@@ -25,6 +25,7 @@ import de.steamwar.bausystem.linkage.LinkageUtils;
 import de.steamwar.bausystem.region.loader.PrototypeLoader;
 import de.steamwar.bausystem.region.loader.RegionLoader;
 import de.steamwar.bausystem.region.loader.Updater;
+import de.steamwar.bausystem.worlddata.WorldData;
 import de.steamwar.message.Message;
 import de.steamwar.scoreboard.SWScoreboard;
 import lombok.Getter;
@@ -84,7 +85,7 @@ public class BauSystem extends JavaPlugin implements Listener {
     public void onDisable() {
         LinkageUtils.unlink();
 
-        RegionLoader.save();
+        WorldData.write();
         Config.getInstance().saveAll();
     }
 
diff --git a/BauSystem_Main/src/de/steamwar/bausystem/region/RegionUtils.java b/BauSystem_Main/src/de/steamwar/bausystem/region/RegionUtils.java
index 098a2dc3..5def64bc 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/region/RegionUtils.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/region/RegionUtils.java
@@ -22,9 +22,9 @@ package de.steamwar.bausystem.region;
 import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.extent.clipboard.Clipboard;
 import de.steamwar.bausystem.BauSystem;
-import de.steamwar.bausystem.region.loader.RegionLoader;
 import de.steamwar.bausystem.region.utils.RegionExtensionType;
 import de.steamwar.bausystem.region.utils.RegionType;
+import de.steamwar.bausystem.worlddata.WorldData;
 import de.steamwar.core.VersionedCallable;
 import lombok.experimental.UtilityClass;
 import net.md_5.bungee.api.ChatMessageType;
@@ -83,7 +83,7 @@ public class RegionUtils {
             region.regionData.add("prototype", region.getPrototype().getName());
         }
         region.regionData.add("flagStorage", FlagStorage.toYAPION(region.getFlagStorage()));
-        RegionLoader.save();
+        WorldData.write();
     }
 
 }
diff --git a/BauSystem_Main/src/de/steamwar/bausystem/region/loader/RegionLoader.java b/BauSystem_Main/src/de/steamwar/bausystem/region/loader/RegionLoader.java
index ddf861d5..2cce1ef0 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/region/loader/RegionLoader.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/region/loader/RegionLoader.java
@@ -22,6 +22,7 @@ package de.steamwar.bausystem.region.loader;
 import de.steamwar.bausystem.region.FlagStorage;
 import de.steamwar.bausystem.region.GlobalRegion;
 import de.steamwar.bausystem.region.Prototype;
+import de.steamwar.bausystem.worlddata.WorldData;
 import lombok.experimental.UtilityClass;
 import org.bukkit.Bukkit;
 import yapion.hierarchy.diff.DiffBase;
@@ -40,17 +41,8 @@ import java.io.IOException;
 public class RegionLoader {
 
     private YAPIONObject loaded = null;
-    private YAPIONObject optionsYapionObject;
     public static final File file = new File(Bukkit.getWorlds().get(0).getWorldFolder(), "regions.yapion");
 
-    public void save() {
-        try {
-            optionsYapionObject.toYAPION(new FileOutput(new File(Bukkit.getWorlds().get(0).getWorldFolder(), "options.yapion"))).close();
-        } catch (IOException e) {
-            // Ignored
-        }
-    }
-
     public void load() {
         YAPIONObject yapionObject = null;
         try (BufferedInputStream bufferedInputStream = new BufferedInputStream(new FileInputStream(file))) {
@@ -64,16 +56,7 @@ public class RegionLoader {
         }
         loaded = yapionObject;
 
-        File optionsFile = new File(Bukkit.getWorlds().get(0).getWorldFolder(), "options.yapion");
-        optionsYapionObject = new YAPIONObject();
-        if (optionsFile.length() != 0) {
-            try (BufferedInputStream bufferedInputStream = new BufferedInputStream(new FileInputStream(optionsFile))) {
-                optionsYapionObject = YAPIONParser.parse(bufferedInputStream);
-            } catch (IOException e) {
-                // Ignored
-            }
-        }
-
+        YAPIONObject optionsYapionObject = WorldData.getRegionsData();
         yapionObject.forEach((key, yapionAnyType) -> {
             if (key.equals("global")) {
                 return;