diff --git a/lib/nyxx_commands.dart b/lib/nyxx_commands.dart
index 66f4ac8..5cf6b60 100644
--- a/lib/nyxx_commands.dart
+++ b/lib/nyxx_commands.dart
@@ -29,15 +29,6 @@ export 'src/commands/message_command.dart' show MessageCommand;
 export 'src/commands/options.dart' show CommandOptions;
 export 'src/commands/user_command.dart' show UserCommand;
 export 'src/context/autocomplete_context.dart' show AutocompleteContext;
-export 'src/context/chat_context.dart'
-    show ChatContext, ChatContextData, InteractionChatContext, MessageChatContext;
-export 'src/context/component_context.dart'
-    show
-        ComponentContextData,
-        ComponentContext,
-        ButtonComponentContext,
-        SelectMenuContext;
-export 'src/context/context_manager.dart' show ContextManager;
 export 'src/context/base.dart'
     show
         CommandContext,
@@ -49,6 +40,11 @@ export 'src/context/base.dart'
         InteractionInteractiveContext,
         InteractiveContext,
         ResponseLevel;
+export 'src/context/chat_context.dart'
+    show ChatContext, ChatContextData, InteractionChatContext, MessageChatContext;
+export 'src/context/component_context.dart'
+    show ComponentContextData, ComponentContext, ButtonComponentContext, SelectMenuContext;
+export 'src/context/context_manager.dart' show ContextManager;
 export 'src/context/message_context.dart' show MessageContext;
 export 'src/context/modal_context.dart' show ModalContext;
 export 'src/context/user_context.dart' show UserContext;
diff --git a/lib/src/commands/chat_command.dart b/lib/src/commands/chat_command.dart
index 25f60e8..e732a40 100644
--- a/lib/src/commands/chat_command.dart
+++ b/lib/src/commands/chat_command.dart
@@ -279,8 +279,12 @@ class ChatCommand
   final List<AbstractCheck> singleChecks = [];
 
   /// The types of the required and positional arguments of [execute], in the order they appear.
+  @Deprecated('Use arguments[].type instead')
   final List<RuntimeType<dynamic>> argumentTypes = [];
 
+  /// The arguments of [execute], in the order they appear.
+  final List<ParameterData<dynamic>> arguments = [];
+
   @override
   final CommandOptions options;
 
@@ -368,7 +372,9 @@ class ChatCommand
         }
       }
 
+      // ignore: deprecated_member_use_from_same_package
       argumentTypes.add(parameter.type);
+      arguments.add(parameter);
     }
   }