diff --git a/base/command/src/main/java/cc/carm/lib/easyplugin/command/CommandHandler.java b/base/command/src/main/java/cc/carm/lib/easyplugin/command/CommandHandler.java
index e2d4968..147e09a 100644
--- a/base/command/src/main/java/cc/carm/lib/easyplugin/command/CommandHandler.java
+++ b/base/command/src/main/java/cc/carm/lib/easyplugin/command/CommandHandler.java
@@ -7,6 +7,7 @@ import org.bukkit.command.TabExecutor;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.bukkit.util.StringUtil;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -19,6 +20,8 @@ public abstract class CommandHandler implements TabExecutor, NamedExecutor {
     protected final @NotNull Map<String, SubCommand> registeredCommands = new HashMap<>();
     protected final @NotNull Map<String, CommandHandler> registeredHandlers = new HashMap<>();
 
+    protected final @NotNull Map<String, String> aliasesMap = new HashMap<>();
+
     public CommandHandler(@NotNull JavaPlugin plugin) {
         this(plugin, plugin.getName());
     }
@@ -40,21 +43,15 @@ public abstract class CommandHandler implements TabExecutor, NamedExecutor {
     }
 
     public void registerSubCommand(SubCommand command) {
-        for (String alias : command.getAliases()) {
-            if (this.registeredCommands.containsKey(alias)) {
-                this.plugin.getLogger().warning("Conflicting command aliases '" + alias + "' for '" + command.getName() + "', overwriting.");
-            }
-            this.registeredCommands.put(alias, command);
-        }
+        String name = command.getName().toLowerCase();
+        this.registeredCommands.put(name, command);
+        command.getAliases().forEach(alias -> this.aliasesMap.put(alias.toLowerCase(), name));
     }
 
     public void registerHandler(CommandHandler handler) {
-        for (String alias : handler.getAliases()) {
-            if (this.registeredCommands.containsKey(alias)) {
-                this.plugin.getLogger().warning("Conflicting command aliases '" + alias + "' for '" + handler.getName() + "', overwriting.");
-            }
-            this.registeredHandlers.put(alias, handler);
-        }
+        String name = handler.getName().toLowerCase();
+        this.registeredHandlers.put(name, handler);
+        handler.getAliases().forEach(alias -> this.aliasesMap.put(alias.toLowerCase(), name));
     }
 
     @Override
@@ -62,28 +59,30 @@ public abstract class CommandHandler implements TabExecutor, NamedExecutor {
         if (args.length == 0) {
             this.noArgs(sender);
         } else {
-            String sub = args[0].toLowerCase();
-            CommandHandler handler = this.registeredHandlers.get(sub);
+            String input = args[0].toLowerCase();
+
+            CommandHandler handler = getHandler(input);
             if (handler != null) {
                 if (!handler.hasPermission(sender)) {
                     this.noPermission(sender);
                 } else {
                     handler.onCommand(sender, command, label, this.shortenArgs(args));
                 }
+            }
+
+            SubCommand subCommand = getSubCommand(input);
+            if (subCommand == null) {
+                this.unknownCommand(sender, args);
+            } else if (!subCommand.hasPermission(sender)) {
+                this.noPermission(sender);
             } else {
-                SubCommand subCommand = this.registeredCommands.get(sub);
-                if (subCommand == null) {
+                try {
+                    subCommand.execute(this.plugin, sender, this.shortenArgs(args));
+                } catch (ArrayIndexOutOfBoundsException var9) {
                     this.unknownCommand(sender, args);
-                } else if (!subCommand.hasPermission(sender)) {
-                    this.noPermission(sender);
-                } else {
-                    try {
-                        subCommand.execute(this.plugin, sender, this.shortenArgs(args));
-                    } catch (ArrayIndexOutOfBoundsException var9) {
-                        this.unknownCommand(sender, args);
-                    }
                 }
             }
+
         }
         return true;
     }
@@ -101,12 +100,12 @@ public abstract class CommandHandler implements TabExecutor, NamedExecutor {
                     .collect(Collectors.toList());
         } else {
 
-            CommandHandler handler = this.registeredHandlers.get(input);
+            CommandHandler handler = getHandler(input);
             if (handler != null && handler.hasPermission(sender)) {
                 return handler.onTabComplete(sender, command, alias, this.shortenArgs(args));
             }
 
-            SubCommand subCommand = this.registeredCommands.get(input);
+            SubCommand subCommand = getSubCommand(input);
             if (subCommand != null && subCommand.hasPermission(sender)) {
                 return subCommand.tabComplete(this.plugin, sender, this.shortenArgs(args));
             }
@@ -124,6 +123,24 @@ public abstract class CommandHandler implements TabExecutor, NamedExecutor {
         return sortedExecutors;
     }
 
+    protected @Nullable CommandHandler getHandler(@NotNull String name) {
+        CommandHandler fromName = this.registeredHandlers.get(name);
+        if (fromName != null) return fromName;
+
+        String nameFromAlias = this.aliasesMap.get(name);
+        if (nameFromAlias == null) return null;
+        else return this.registeredHandlers.get(nameFromAlias);
+    }
+
+    protected @Nullable SubCommand getSubCommand(@NotNull String name) {
+        SubCommand fromName = this.registeredCommands.get(name);
+        if (fromName != null) return fromName;
+
+        String nameFromAlias = this.aliasesMap.get(name);
+        if (nameFromAlias == null) return null;
+        else return this.registeredCommands.get(nameFromAlias);
+    }
+
     protected String[] shortenArgs(String[] args) {
         if (args.length == 0) {
             return args;
diff --git a/base/command/src/main/java/cc/carm/lib/easyplugin/command/SubCommand.java b/base/command/src/main/java/cc/carm/lib/easyplugin/command/SubCommand.java
index bc4e604..3b6d447 100644
--- a/base/command/src/main/java/cc/carm/lib/easyplugin/command/SubCommand.java
+++ b/base/command/src/main/java/cc/carm/lib/easyplugin/command/SubCommand.java
@@ -3,15 +3,34 @@ package cc.carm.lib.easyplugin.command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.plugin.java.JavaPlugin;
 
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
 @SuppressWarnings("UnusedReturnValue")
 public abstract class SubCommand implements NamedExecutor {
+
     private final String name;
+    private final String[] aliases;
 
     public SubCommand(String name) {
+        this(name, new String[0]);
+    }
+
+    public SubCommand(String name, String... aliases) {
         this.name = name;
+        this.aliases = aliases;
+    }
+
+
+    @Override
+    public String getName() {
+        return this.name;
+    }
+
+    @Override
+    public List<String> getAliases() {
+        return Arrays.asList(this.aliases);
     }
 
     public abstract Void execute(JavaPlugin plugin, CommandSender sender, String[] args);
@@ -20,9 +39,5 @@ public abstract class SubCommand implements NamedExecutor {
         return Collections.emptyList();
     }
 
-    @Override
-    public String getName() {
-        return this.name;
-    }
 
 }