diff --git a/src/commands/BaseCommand.ts b/src/commands/BaseCommand.ts
index e448aa0..a091fd2 100644
--- a/src/commands/BaseCommand.ts
+++ b/src/commands/BaseCommand.ts
@@ -98,13 +98,13 @@ export class BaseCommand {
      * @param {InputParameter[]} [cmdParams] - list of processed parameters passed in a Discord interaction
      * @returns {Promise<void>}
      */
-    public async start(args: ReadonlyMap<string, ParameterResolvable> | TargetID, interaction: Message | Interaction): Promise<void> {
+    public async start(args: ReadonlyMap<string, ParameterResolvable>, interaction: Message | Interaction, target?: TargetID): Promise<void> {
         if (interaction instanceof Interaction && !interaction.isCommand() && !interaction.isContextMenu()) throw new TypeError(`Interaction not recognized`);
         if (this.permissionChecker(interaction)) {
             if (interaction instanceof Interaction) {
                 await interaction.deferReply();
             }
-            await this.handleReply(interaction, await this.function(args, interaction));
+            await this.handleReply(interaction, await this.function(args, interaction, target));
         } else {
             throw new PermissionsError(this, interaction.member as GuildMember);
         }
diff --git a/src/commands/ChatCommand.ts b/src/commands/ChatCommand.ts
index 4d6eb37..21db948 100644
--- a/src/commands/ChatCommand.ts
+++ b/src/commands/ChatCommand.ts
@@ -88,11 +88,11 @@ export class ChatCommand extends BaseCommand {
      * @param {InputParameter[]} [cmdParams] - list of processed parameters passed in a Discord interaction
      * @returns {Promise<void>}
      */
-    public async start(args: ReadonlyMap<string, ParameterResolvable> | TargetID, interaction: Message | Interaction): Promise<void> {
+    public async start(args: ReadonlyMap<string, ParameterResolvable>, interaction: Message | Interaction, target?: TargetID): Promise<void> {
         if (!this.slash && interaction instanceof Interaction) {
             throw new Error("This command is not available as a slash command");
         }
-        super.start(args, interaction);
+        super.start(args, interaction, target);
     }
 
     /**
diff --git a/src/commands/CommandManager.ts b/src/commands/CommandManager.ts
index 008f44c..8fe9733 100644
--- a/src/commands/CommandManager.ts
+++ b/src/commands/CommandManager.ts
@@ -112,7 +112,8 @@ export class CommandManager {
                     const target = new TargetID(i.targetId, i.targetType);
                     return {
                         command: cmd,
-                        parameters: target,
+                        parameters: new Map(),
+                        target: target,
                     };
                 } else {
                     throw new CommandNotFound(i.commandName);
diff --git a/src/commands/Help.ts b/src/commands/Help.ts
index f2da816..e7fa514 100644
--- a/src/commands/Help.ts
+++ b/src/commands/Help.ts
@@ -20,16 +20,13 @@ export class HelpMessage extends ChatCommand {
                 },
             ],
             function: (args, i) => {
-                if (!(args instanceof Map)) {
-                    return;
-                }
                 const helpMsg = new MessageEmbed();
                 helpMsg.setColor(params.color);
                 helpMsg.setTimestamp();
                 helpMsg.setFooter(botName || "");
                 if (helpMsg != null) {
                     if (args.get("command_name")) {
-                        const cmd: ChatCommand | null = cmdManager.get(args.get("command_name") || "", "CHAT");
+                        const cmd: ChatCommand | null = cmdManager.get(args.get("command_name")?.toString() || "", "CHAT");
                         if (cmd) {
                             if (Array.isArray(cmd.guilds) && cmd.guilds.length > 0 && !cmd.guilds.find((g) => i?.guild?.id === g)) {
                                 throw new ReferenceError(`Command "${cmd.name}" is not available`);
diff --git a/src/commands/types/commands.ts b/src/commands/types/commands.ts
index 0771d14..cf912c7 100644
--- a/src/commands/types/commands.ts
+++ b/src/commands/types/commands.ts
@@ -11,9 +11,10 @@ export type CommandType = "CHAT" | "CONTEXT";
 
 export type CommandFunctionReturnTypes = void | string | MessageEmbed | ReplyMessageOptions | Promise<void | string | MessageEmbed | ReplyMessageOptions>;
 
-export type CommandFunction = (args: ReadonlyMap<string, ParameterResolvable> | TargetID, interaction?: Message | CommandInteraction) => CommandFunctionReturnTypes;
+export type CommandFunction = (args: ReadonlyMap<string, ParameterResolvable>, i: Message | CommandInteraction, t?: TargetID) => CommandFunctionReturnTypes;
 
 export interface CommandInteractionData {
     command: BaseCommand;
-    parameters: ReadonlyMap<string, ParameterResolvable> | TargetID;
+    parameters: ReadonlyMap<string, ParameterResolvable>;
+    target?: TargetID;
 }
diff --git a/src/structures/Bot.ts b/src/structures/Bot.ts
index f484237..65d000b 100644
--- a/src/structures/Bot.ts
+++ b/src/structures/Bot.ts
@@ -205,7 +205,7 @@ export class Bot extends EventEmitter {
                     cmd = this.commands.fetch(i);
                     if (cmd) {
                         this.emit("COMMAND", i, cmd);
-                        await cmd.command.start(cmd.parameters, i);
+                        await cmd.command.start(cmd.parameters, i, cmd.target);
                     }
                 } catch (e) {
                     if (e instanceof PermissionsError) {