diff --git a/BauSystem_Main/src/de/steamwar/bausystem/region/FlagStorage.java b/BauSystem_Main/src/de/steamwar/bausystem/region/FlagStorage.java
index a5712426..46fc70ba 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/region/FlagStorage.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/region/FlagStorage.java
@@ -22,7 +22,8 @@ package de.steamwar.bausystem.region;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonPrimitive;
 import de.steamwar.bausystem.region.flags.Flag;
-import java.util.HashMap;
+
+import java.util.EnumMap;
 import java.util.Map;
 
 public class FlagStorage {
@@ -31,7 +32,7 @@ public class FlagStorage {
 	protected final JsonObject jsonObject;
 
 	public FlagStorage(final JsonObject jsonObject) {
-		flags = new HashMap<>();
+		flags = new EnumMap<>(Flag.class);
 		this.jsonObject = jsonObject;
 		readKeys();
 	}
diff --git a/BauSystem_Main/src/de/steamwar/bausystem/region/flags/Flag.java b/BauSystem_Main/src/de/steamwar/bausystem/region/flags/Flag.java
index 2e4cc0cc..70bc3128 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/region/flags/Flag.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/region/flags/Flag.java
@@ -19,7 +19,6 @@
 
 package de.steamwar.bausystem.region.flags;
 
-
 import de.steamwar.bausystem.region.flags.flagvalues.*;
 import java.util.EnumSet;
 import java.util.Set;
diff --git a/BauSystem_Main/src/de/steamwar/bausystem/region/flags/flagvalues/DAMAGEMode.java b/BauSystem_Main/src/de/steamwar/bausystem/region/flags/flagvalues/DAMAGEMode.java
index 28a97283..e2ea369b 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/region/flags/flagvalues/DAMAGEMode.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/region/flags/flagvalues/DAMAGEMode.java
@@ -24,7 +24,6 @@ import lombok.AllArgsConstructor;
 import lombok.Getter;
 import net.md_5.bungee.api.ChatColor;
 
-
 @Getter
 @AllArgsConstructor
 public enum DAMAGEMode implements Flag.Value<DAMAGEMode> {
diff --git a/BauSystem_Main/src/de/steamwar/bausystem/region/flags/flagvalues/FIREMode.java b/BauSystem_Main/src/de/steamwar/bausystem/region/flags/flagvalues/FIREMode.java
index 237fe1f8..16765474 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/region/flags/flagvalues/FIREMode.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/region/flags/flagvalues/FIREMode.java
@@ -24,7 +24,6 @@ import lombok.AllArgsConstructor;
 import lombok.Getter;
 import net.md_5.bungee.api.ChatColor;
 
-
 @Getter
 @AllArgsConstructor
 public enum FIREMode implements Flag.Value<FIREMode> {
diff --git a/BauSystem_Main/src/de/steamwar/bausystem/region/flags/flagvalues/FREEZEMode.java b/BauSystem_Main/src/de/steamwar/bausystem/region/flags/flagvalues/FREEZEMode.java
index 0214bd90..123e63e5 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/region/flags/flagvalues/FREEZEMode.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/region/flags/flagvalues/FREEZEMode.java
@@ -25,7 +25,6 @@ import lombok.AllArgsConstructor;
 import lombok.Getter;
 import net.md_5.bungee.api.ChatColor;
 
-
 @Getter
 @AllArgsConstructor
 public enum FREEZEMode implements Flag.Value<FREEZEMode> {
diff --git a/BauSystem_Main/src/de/steamwar/bausystem/region/flags/flagvalues/TNTMode.java b/BauSystem_Main/src/de/steamwar/bausystem/region/flags/flagvalues/TNTMode.java
index 948dcd2b..c649e183 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/region/flags/flagvalues/TNTMode.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/region/flags/flagvalues/TNTMode.java
@@ -24,7 +24,6 @@ import lombok.AllArgsConstructor;
 import lombok.Getter;
 import net.md_5.bungee.api.ChatColor;
 
-
 @Getter
 @AllArgsConstructor
 public enum TNTMode implements Flag.Value<TNTMode> {