diff --git a/src/main/java/com/sekwah/advancedportals/spigot/AdvancedPortalsPlugin.java b/src/main/java/com/sekwah/advancedportals/spigot/AdvancedPortalsPlugin.java
index 6143f56..608c154 100644
--- a/src/main/java/com/sekwah/advancedportals/spigot/AdvancedPortalsPlugin.java
+++ b/src/main/java/com/sekwah/advancedportals/spigot/AdvancedPortalsPlugin.java
@@ -20,7 +20,7 @@ public class AdvancedPortalsPlugin extends JavaPlugin {
 
     public void onEnable() {
         // TODO actually get the minecraft version
-        this.portalsCore = new AdvancedPortalsCore(new DataStorage(this.getDataFolder()),
+        this.portalsCore = new AdvancedPortalsCore(this.getDataFolder(),
                 new SpigotInfoLogger(this), new CommandRegister(this), new ConnectorDataCollector(), new int[]{1,12,2});
         //injector = Guice.createInjector(new RepositoryModule(this.portalsCore));
         this.getServer().getPluginManager().registerEvents(new Listeners(), this);
diff --git a/src/main/java/com/sekwah/advancedportals/spigot/Listeners.java b/src/main/java/com/sekwah/advancedportals/spigot/Listeners.java
index 7227eb9..8f038da 100644
--- a/src/main/java/com/sekwah/advancedportals/spigot/Listeners.java
+++ b/src/main/java/com/sekwah/advancedportals/spigot/Listeners.java
@@ -19,7 +19,7 @@ import javax.inject.Inject;
 
 public class Listeners implements Listener {
 
-    private CoreListeners coreListeners = AdvancedPortalsCore.getCoreListeners();
+    private CoreListeners coreListeners = AdvancedPortalsCore.getInstance().getCoreListeners();
 
     @EventHandler
     public void onJoinEvent(PlayerJoinEvent event) {