diff --git a/src/commands/client.ts b/src/commands/client.ts
index 22b0117..9442f4f 100644
--- a/src/commands/client.ts
+++ b/src/commands/client.ts
@@ -9,6 +9,7 @@ import {
   CommandsManager,
   parseCommand
 } from './command.ts'
+import { parseArgs } from '../utils/command.ts'
 import { Extension, ExtensionsManager } from './extension.ts'
 
 type PrefixReturnType = string | string[] | Promise<string | string[]>
@@ -239,7 +240,7 @@ export class CommandClient extends Client implements CommandClientOptions {
       client: this,
       name: parsed.name,
       prefix,
-      args: parsed.args,
+      args: parseArgs(command.args, parsed.args),
       argString: parsed.argString,
       message: msg,
       author: msg.author,
diff --git a/src/commands/command.ts b/src/commands/command.ts
index 987eaee..8601d70 100644
--- a/src/commands/command.ts
+++ b/src/commands/command.ts
@@ -6,7 +6,7 @@ import { Collection } from '../utils/collection.ts'
 import type { CommandClient } from './client.ts'
 import type { Extension } from './extension.ts'
 import { join, walk } from '../../deps.ts'
-
+import type { Args } from '../utils/command.ts'
 export interface CommandContext {
   /** The Client object */
   client: CommandClient
@@ -23,7 +23,7 @@ export interface CommandContext {
   /** Name of Command which was used */
   name: string
   /** Array of Arguments used with Command */
-  args: string[]
+  args: Record<string, unknown> | null
   /** Complete Raw String of Arguments */
   argString: string
   /** Guild which the command has called */
@@ -46,7 +46,7 @@ export interface CommandOptions {
   /** Usage Example of Command, only Arguments (without Prefix and Name) */
   examples?: string | string[]
   /** Does the Command take Arguments? Maybe number of required arguments? Or list of arguments? */
-  args?: number | boolean | string[]
+  args?: Args[]
   /** Permissions(s) required by both User and Bot in order to use Command */
   permissions?: string | string[]
   /** Permission(s) required for using Command */
@@ -81,7 +81,7 @@ export class Command implements CommandOptions {
   extension?: Extension
   usage?: string | string[]
   examples?: string | string[]
-  args?: number | boolean | string[]
+  args?: Args[]
   permissions?: string | string[]
   userPermissions?: string | string[]
   botPermissions?: string | string[]
diff --git a/src/utils/command.ts b/src/utils/command.ts
index 30c206e..f8b34ac 100644
--- a/src/utils/command.ts
+++ b/src/utils/command.ts
@@ -15,10 +15,11 @@ export interface Args {
 
 const mentionRegex = /([0-9]{18})/g
 
-export function parseArgs2(
-  commandArgs: Args[],
+export function parseArgs(
+  commandArgs: Args[] | undefined,
   messageArgs: string[]
-): Record<string, unknown> {
+): Record<string, unknown> | null {
+  if (!commandArgs) return null
   const messageArgsNullableCopy: Array<string | null> = [...messageArgs]
   const args: Record<string, unknown> = {}
   for (const entry of commandArgs) {