diff --git a/common/src/main/java/com/jazzkuh/commandlib/common/resolvers/Resolvers.java b/common/src/main/java/com/jazzkuh/commandlib/common/resolvers/Resolvers.java
index 2668cf2..6094c71 100644
--- a/common/src/main/java/com/jazzkuh/commandlib/common/resolvers/Resolvers.java
+++ b/common/src/main/java/com/jazzkuh/commandlib/common/resolvers/Resolvers.java
@@ -16,10 +16,15 @@ public class Resolvers {
     static {
         contextResolvers.put(String.class, new StringResolver());
         contextResolvers.put(Boolean.class, new BooleanResolver());
+        contextResolvers.put(boolean.class, new BooleanResolver());
         contextResolvers.put(Integer.class, new IntegerResolver());
+        contextResolvers.put(int.class, new IntegerResolver());
         contextResolvers.put(Double.class, new DoubleResolver());
+        contextResolvers.put(double.class, new DoubleResolver());
         contextResolvers.put(Long.class, new LongResolver());
+        contextResolvers.put(long.class, new LongResolver());
         contextResolvers.put(Float.class, new FloatResolver());
+        contextResolvers.put(float.class, new FloatResolver());
         contextResolvers.put(UUID.class, new UUIDResolver());
     }
 
diff --git a/minestom/src/main/java/com/jazzkuh/commandlib/minestom/AnnotationCommand.java b/minestom/src/main/java/com/jazzkuh/commandlib/minestom/AnnotationCommand.java
index df4825f..c0e6572 100644
--- a/minestom/src/main/java/com/jazzkuh/commandlib/minestom/AnnotationCommand.java
+++ b/minestom/src/main/java/com/jazzkuh/commandlib/minestom/AnnotationCommand.java
@@ -2,8 +2,11 @@
 
 import com.jazzkuh.commandlib.common.*;
 import com.jazzkuh.commandlib.common.annotations.Main;
+import com.jazzkuh.commandlib.common.annotations.Optional;
 import com.jazzkuh.commandlib.common.annotations.Subcommand;
 import com.jazzkuh.commandlib.common.exception.*;
+import com.jazzkuh.commandlib.common.resolvers.ContextResolver;
+import com.jazzkuh.commandlib.common.resolvers.Resolvers;
 import com.jazzkuh.commandlib.minestom.terminal.LoggingConsoleSender;
 import com.jazzkuh.commandlib.minestom.utils.StringUtils;
 import com.jazzkuh.commandlib.minestom.utils.permission.Permissable;
@@ -23,7 +26,10 @@
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
-import java.util.*;
+import java.lang.reflect.Parameter;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 
 public class AnnotationCommand extends Command implements AnnotationCommandImpl {
     private static final ComponentLogger LOGGER = ComponentLogger.logger("CommandLibrary");
@@ -57,7 +63,7 @@ private void init() {
         List<Method> mainCommandMethods = Arrays.stream(this.getClass().getMethods())
                 .filter(method -> method.isAnnotationPresent(Main.class))
                 .toList();
-        
+
         mainCommandMethods.forEach(method -> this.mainCommands.add(AnnotationCommandParser.parse(this, method)));
 
         List<String> allAliases = new ArrayList<>();
@@ -98,7 +104,7 @@ private void init() {
 
         setDefaultExecutor(this::execute);
         addSyntax(this::execute, params);
-        
+
         boolean allMainCommandsHavePermissions = !this.mainCommands.isEmpty() &&
                 this.mainCommands.stream().allMatch(cmd -> cmd.getPermission() != null);
 
@@ -153,12 +159,118 @@ public void execute(CommandSender sender, CommandContext context) {
             return;
         }
 
+        AnnotationSubCommand matchingCommand = findMatchingMainCommand(args);
+        if (matchingCommand != null) {
+            this.executeCommand(matchingCommand, sender, args);
+        } else {
+            this.formatUsage(sender);
+        }
+    }
+
+    private AnnotationSubCommand findMatchingMainCommand(String[] args) {
+        if (mainCommands.size() == 1) {
+            return mainCommands.get(0);
+        }
+
         for (AnnotationSubCommand mainCommand : mainCommands) {
-            this.executeCommand(mainCommand, sender, args);
-            return;
+            if (canCommandHandleArgs(mainCommand, args)) {
+                return mainCommand;
+            }
+        }
+
+        return null;
+    }
+
+    private boolean canCommandHandleArgs(AnnotationSubCommand command, String[] args) {
+        Method method = command.getMethod();
+        Parameter[] parameters = method.getParameters();
+
+        int requiredParamCount = 0;
+        int totalParamCount = parameters.length - 1;
+
+        for (int i = 1; i < parameters.length; i++) {
+            if (!parameters[i].isAnnotationPresent(Optional.class)) {
+                requiredParamCount++;
+            }
+        }
+
+        if (args.length < requiredParamCount || args.length > totalParamCount) {
+            return false;
+        }
+
+        for (int i = 0; i < args.length && i + 1 < parameters.length; i++) {
+            Parameter param = parameters[i + 1];
+            Class<?> paramType = param.getType();
+            String arg = args[i];
+
+            if (!isArgCompatibleWithType(arg, paramType)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    private boolean isArgCompatibleWithType(String arg, Class<?> type) {
+        if (type == int.class || type == Integer.class) {
+            try {
+                Integer.parseInt(arg);
+                return true;
+            } catch (NumberFormatException e) {
+                return false;
+            }
+        }
+
+        if (type == double.class || type == Double.class) {
+            try {
+                Double.parseDouble(arg);
+                return true;
+            } catch (NumberFormatException e) {
+                return false;
+            }
+        }
+
+        if (type == float.class || type == Float.class) {
+            try {
+                Float.parseFloat(arg);
+                return true;
+            } catch (NumberFormatException e) {
+                return false;
+            }
+        }
+
+        if (type == long.class || type == Long.class) {
+            try {
+                Long.parseLong(arg);
+                return true;
+            } catch (NumberFormatException e) {
+                return false;
+            }
+        }
+
+        if (type == boolean.class || type == Boolean.class) {
+            return "true".equalsIgnoreCase(arg) || "false".equalsIgnoreCase(arg);
+        }
+
+        if (type.isEnum()) {
+            try {
+                Enum.valueOf((Class<? extends Enum>) type, arg.toUpperCase());
+                return true;
+            } catch (IllegalArgumentException e) {
+                return false;
+            }
+        }
+
+        ContextResolver<?> resolver = Resolvers.context(type);
+        if (resolver != null) {
+            try {
+                return resolver.resolve(arg) != null;
+            } catch (Exception e) {
+                return false;
+            }
         }
 
-        this.formatUsage(sender);
+        return type == String.class;
     }
 
     private void executeCommand(AnnotationSubCommand subCommand, CommandSender sender, String[] args) {