diff --git a/src/de/steamwar/bungeecore/commands/ListCommand.java b/src/de/steamwar/bungeecore/commands/ListCommand.java
index 631f408..6caa4a1 100644
--- a/src/de/steamwar/bungeecore/commands/ListCommand.java
+++ b/src/de/steamwar/bungeecore/commands/ListCommand.java
@@ -22,6 +22,7 @@ package de.steamwar.bungeecore.commands;
 import de.steamwar.bungeecore.Message;
 import de.steamwar.bungeecore.Servertype;
 import de.steamwar.bungeecore.Subserver;
+import de.steamwar.command.SWCommand;
 import net.md_5.bungee.api.CommandSender;
 import net.md_5.bungee.api.ProxyServer;
 import net.md_5.bungee.api.config.ServerInfo;
@@ -33,7 +34,7 @@ import java.util.List;
 import java.util.TreeMap;
 import java.util.stream.Collectors;
 
-public class ListCommand extends BasicCommand {
+public class ListCommand extends SWCommand {
 
     public ListCommand() {
         super("list", "");
@@ -60,8 +61,8 @@ public class ListCommand extends BasicCommand {
         return playerMap;
     }
 
-    @Override
-    public void execute(CommandSender commandSender, String[] strings) {
+    @Register
+    public void genericCommand(CommandSender commandSender) {
         TreeMap<String, List<ProxiedPlayer>> playerMap = getCustomTablist();
         for (String server : playerMap.navigableKeySet()) {
             String serverName = server;