diff --git a/gradle.properties b/gradle.properties
index 91e77e12..e448fbac 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -11,7 +11,7 @@ minecraft_version=1.21.1-R0.1-SNAPSHOT
 # Dependencies
 protocollib_version=5.3.0
 #ld_version=10.0.33
-pluginbase_version=292d5f3a
+pluginbase_version=f19aea37
 gsit_version=1.6.0
 papi_version=2.11.5
 bstats_version=3.0.2
diff --git a/src/main/java/xyz/nifeather/morph/MorphPlugin.java b/src/main/java/xyz/nifeather/morph/MorphPlugin.java
index 257b3600..63b60dba 100644
--- a/src/main/java/xyz/nifeather/morph/MorphPlugin.java
+++ b/src/main/java/xyz/nifeather/morph/MorphPlugin.java
@@ -1,6 +1,7 @@
 package xyz.nifeather.morph;
 
 import com.ticxo.modelengine.api.ModelEngineAPI;
+import it.unimi.dsi.fastutil.objects.ObjectArrayList;
 import net.kyori.adventure.text.minimessage.MiniMessage;
 import org.bstats.bukkit.Metrics;
 import org.bukkit.Bukkit;
@@ -8,6 +9,7 @@
 import org.bukkit.plugin.PluginManager;
 import org.bukkit.scoreboard.Scoreboard;
 import org.jetbrains.annotations.ApiStatus;
+import xiamomc.pluginbase.ScheduleInfo;
 import xyz.nifeather.morph.abilities.AbilityManager;
 import xyz.nifeather.morph.commands.MorphCommandManager;
 import xyz.nifeather.morph.config.MorphConfigManager;
@@ -63,7 +65,7 @@ public static String getMorphNameSpace()
     }
 
     @Override
-    public String getNameSpace()
+    public String getNamespace()
     {
         return getMorphNameSpace();
     }
@@ -122,9 +124,9 @@ private void printImportantWarning(boolean critical, String... warnings)
     }
 
     @Override
-    public void onEnable()
+    protected void enable()
     {
-        super.onEnable();
+        super.enable();
 
         pluginManager = Bukkit.getPluginManager();
         var bukkitVersion = Bukkit.getMinecraftVersion();
@@ -256,17 +258,8 @@ public void onEnable()
         IconLookup.instance();
     }
 
-    @ApiStatus.Internal
-    public void crash(Throwable t)
-    {
-        logger.error(t.getLocalizedMessage());
-        t.printStackTrace();
-
-        this.onDisable();
-    }
-
     @Override
-    public void onDisable()
+    public void disable()
     {
         if (!getServer().isStopping())
         {
@@ -312,7 +305,7 @@ public void onDisable()
             e.printStackTrace();
         }
 
-        super.onDisable();
+        super.disable();
     }
 
     private void registerListeners(Listener[] listeners)