diff --git a/build.gradle b/build.gradle
index b64c141..3831ba4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -47,18 +47,18 @@ dependencies {
     def version = versionFile.text.trim()
     paperweight.foliaDevBundle("$version-R0.1-SNAPSHOT")
 
-    def core = "4.3.21"
+    def core = "4.5.7"
     implementation "me.hsgamer:hscore-bukkit-config:$core"
     implementation "me.hsgamer:hscore-bukkit-utils:$core"
-    implementation "me.hsgamer:hscore-bukkit-command-sub:$core"
     implementation "me.hsgamer:hscore-config-proxy:$core"
     implementation "me.hsgamer:hscore-common:$core"
 
-    def minelib = "1.1.2"
+    def minelib = "1.2.5"
     implementation "io.github.projectunified:minelib-plugin-base:$minelib"
     implementation "io.github.projectunified:minelib-plugin-listener:$minelib"
     implementation "io.github.projectunified:minelib-plugin-permission:$minelib"
     implementation "io.github.projectunified:minelib-plugin-command:$minelib"
+    implementation "io.github.projectunified:minelib-util-subcommand:$minelib"
 }
 
 assemble {
diff --git a/src/main/java/me/hsgamer/morefoworld/command/MainCommand.java b/src/main/java/me/hsgamer/morefoworld/command/MainCommand.java
index b4e52b6..c239e1e 100644
--- a/src/main/java/me/hsgamer/morefoworld/command/MainCommand.java
+++ b/src/main/java/me/hsgamer/morefoworld/command/MainCommand.java
@@ -1,6 +1,6 @@
 package me.hsgamer.morefoworld.command;
 
-import me.hsgamer.hscore.bukkit.command.sub.SubCommandManager;
+import io.github.projectunified.minelib.util.subcommand.SubCommandManager;
 import me.hsgamer.morefoworld.MoreFoWorld;
 import me.hsgamer.morefoworld.command.sub.*;
 import org.bukkit.command.Command;
diff --git a/src/main/java/me/hsgamer/morefoworld/command/sub/CurrentCommand.java b/src/main/java/me/hsgamer/morefoworld/command/sub/CurrentCommand.java
index a2bb405..b301086 100644
--- a/src/main/java/me/hsgamer/morefoworld/command/sub/CurrentCommand.java
+++ b/src/main/java/me/hsgamer/morefoworld/command/sub/CurrentCommand.java
@@ -1,6 +1,6 @@
 package me.hsgamer.morefoworld.command.sub;
 
-import me.hsgamer.hscore.bukkit.command.sub.SubCommand;
+import io.github.projectunified.minelib.util.subcommand.SubCommand;
 import me.hsgamer.hscore.bukkit.utils.MessageUtils;
 import me.hsgamer.morefoworld.Permissions;
 import org.bukkit.Bukkit;
diff --git a/src/main/java/me/hsgamer/morefoworld/command/sub/LinkWorldCommand.java b/src/main/java/me/hsgamer/morefoworld/command/sub/LinkWorldCommand.java
index 0156c08..e206a38 100644
--- a/src/main/java/me/hsgamer/morefoworld/command/sub/LinkWorldCommand.java
+++ b/src/main/java/me/hsgamer/morefoworld/command/sub/LinkWorldCommand.java
@@ -1,6 +1,6 @@
 package me.hsgamer.morefoworld.command.sub;
 
-import me.hsgamer.hscore.bukkit.command.sub.SubCommand;
+import io.github.projectunified.minelib.util.subcommand.SubCommand;
 import me.hsgamer.hscore.bukkit.utils.MessageUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.World;
diff --git a/src/main/java/me/hsgamer/morefoworld/command/sub/SetSpawnCommand.java b/src/main/java/me/hsgamer/morefoworld/command/sub/SetSpawnCommand.java
index 89ad50b..cac3db3 100644
--- a/src/main/java/me/hsgamer/morefoworld/command/sub/SetSpawnCommand.java
+++ b/src/main/java/me/hsgamer/morefoworld/command/sub/SetSpawnCommand.java
@@ -1,6 +1,6 @@
 package me.hsgamer.morefoworld.command.sub;
 
-import me.hsgamer.hscore.bukkit.command.sub.SubCommand;
+import io.github.projectunified.minelib.util.subcommand.SubCommand;
 import me.hsgamer.hscore.bukkit.utils.MessageUtils;
 import me.hsgamer.morefoworld.MoreFoWorld;
 import me.hsgamer.morefoworld.Permissions;
diff --git a/src/main/java/me/hsgamer/morefoworld/command/sub/TeleportCommand.java b/src/main/java/me/hsgamer/morefoworld/command/sub/TeleportCommand.java
index 2a9d06c..5707c6a 100644
--- a/src/main/java/me/hsgamer/morefoworld/command/sub/TeleportCommand.java
+++ b/src/main/java/me/hsgamer/morefoworld/command/sub/TeleportCommand.java
@@ -1,6 +1,6 @@
 package me.hsgamer.morefoworld.command.sub;
 
-import me.hsgamer.hscore.bukkit.command.sub.SubCommand;
+import io.github.projectunified.minelib.util.subcommand.SubCommand;
 import me.hsgamer.hscore.bukkit.utils.MessageUtils;
 import me.hsgamer.morefoworld.MoreFoWorld;
 import me.hsgamer.morefoworld.Permissions;
diff --git a/src/main/java/me/hsgamer/morefoworld/command/sub/UnlinkWorldCommand.java b/src/main/java/me/hsgamer/morefoworld/command/sub/UnlinkWorldCommand.java
index 19c03b3..b7b9398 100644
--- a/src/main/java/me/hsgamer/morefoworld/command/sub/UnlinkWorldCommand.java
+++ b/src/main/java/me/hsgamer/morefoworld/command/sub/UnlinkWorldCommand.java
@@ -1,6 +1,6 @@
 package me.hsgamer.morefoworld.command.sub;
 
-import me.hsgamer.hscore.bukkit.command.sub.SubCommand;
+import io.github.projectunified.minelib.util.subcommand.SubCommand;
 import me.hsgamer.hscore.bukkit.utils.MessageUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.World;
diff --git a/src/main/java/me/hsgamer/morefoworld/listener/PortalListener.java b/src/main/java/me/hsgamer/morefoworld/listener/PortalListener.java
index 99a61b2..4bc4c0f 100644
--- a/src/main/java/me/hsgamer/morefoworld/listener/PortalListener.java
+++ b/src/main/java/me/hsgamer/morefoworld/listener/PortalListener.java
@@ -21,12 +21,18 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ConcurrentHashMap;
 
-public class PortalListener extends ListenerComponent {
+public class PortalListener implements ListenerComponent {
     private final ConcurrentHashMap<UUID, Material> portalTeleportCache = new ConcurrentHashMap<>();
+    private final BasePlugin plugin;
     private DebugComponent debug;
 
     public PortalListener(BasePlugin plugin) {
-        super(plugin);
+        this.plugin = plugin;
+    }
+
+    @Override
+    public BasePlugin getPlugin() {
+        return plugin;
     }
 
     @Override
diff --git a/src/main/java/me/hsgamer/morefoworld/listener/RespawnListener.java b/src/main/java/me/hsgamer/morefoworld/listener/RespawnListener.java
index 0add3dd..3a75c73 100644
--- a/src/main/java/me/hsgamer/morefoworld/listener/RespawnListener.java
+++ b/src/main/java/me/hsgamer/morefoworld/listener/RespawnListener.java
@@ -10,11 +10,17 @@
 
 import java.util.Optional;
 
-public class RespawnListener extends ListenerComponent {
+public class RespawnListener implements ListenerComponent {
+    private final BasePlugin plugin;
     private DebugComponent debug;
 
     public RespawnListener(BasePlugin plugin) {
-        super(plugin);
+        this.plugin = plugin;
+    }
+
+    @Override
+    public BasePlugin getPlugin() {
+        return plugin;
     }
 
     @Override
diff --git a/src/main/java/me/hsgamer/morefoworld/listener/SpawnListener.java b/src/main/java/me/hsgamer/morefoworld/listener/SpawnListener.java
index d13830e..ff7ec3c 100644
--- a/src/main/java/me/hsgamer/morefoworld/listener/SpawnListener.java
+++ b/src/main/java/me/hsgamer/morefoworld/listener/SpawnListener.java
@@ -6,9 +6,16 @@
 import org.bukkit.event.EventHandler;
 import org.spigotmc.event.player.PlayerSpawnLocationEvent;
 
-public class SpawnListener extends ListenerComponent {
+public class SpawnListener implements ListenerComponent {
+    private final BasePlugin plugin;
+
     public SpawnListener(BasePlugin plugin) {
-        super(plugin);
+        this.plugin = plugin;
+    }
+
+    @Override
+    public BasePlugin getPlugin() {
+        return plugin;
     }
 
     @EventHandler