diff --git a/SchematicSystem_Main/src/de/steamwar/schematicsystem/CheckSchemType.java b/SchematicSystem_Main/src/de/steamwar/schematicsystem/CheckSchemType.java
index 09546a9..e1cd8c5 100644
--- a/SchematicSystem_Main/src/de/steamwar/schematicsystem/CheckSchemType.java
+++ b/SchematicSystem_Main/src/de/steamwar/schematicsystem/CheckSchemType.java
@@ -19,12 +19,14 @@
 
 package de.steamwar.schematicsystem;
 
-import de.steamwar.core.Core;
+import de.steamwar.core.VersionedCallable;
 import de.steamwar.sql.Schematic;
 import de.steamwar.sql.SchematicType;
 import org.bukkit.configuration.ConfigurationSection;
 
-import java.util.*;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 public class CheckSchemType implements ICheckSchemType {
 
@@ -67,14 +69,10 @@ public class CheckSchemType implements ICheckSchemType {
     }
 
     public AutoCheckResult autoCheck(Schematic schematic) {
-        switch(Core.getVersion()){
-            case 15:
-                return CheckSchemType_15.autoCheck(schematic, this);
-            case 12:
-                return CheckSchemType_12.autoCheck(schematic, this);
-            default:
-                return new AutoCheckResult();
-        }
+        return VersionedCallable.call(new VersionedCallable<>(AutoCheckResult::new, 8),
+                new VersionedCallable<>(() -> CheckSchemType_12.autoCheck(schematic, null), 12),
+                new VersionedCallable<>(AutoCheckResult::new, 13),
+                new VersionedCallable<>(() -> CheckSchemType_15.autoCheck(schematic, null), 15));
     }
 
     @Override