From de3da2e5c175b74980f78ae1d9349593d425775f Mon Sep 17 00:00:00 2001
From: Kaktushose <42280757+Kaktushose@users.noreply.github.com>
Date: Wed, 24 Apr 2024 17:54:26 +0200
Subject: [PATCH 01/38] remove obsolete methods in PermissionsProvider

---
 pom.xml                                       | 11 ++++++++
 .../permissions/PermissionsProvider.java      | 26 -------------------
 2 files changed, 11 insertions(+), 26 deletions(-)

diff --git a/pom.xml b/pom.xml
index a3f933bec..ffa45b1b0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -106,5 +106,16 @@
             <artifactId>annotations</artifactId>
             <version>24.0.1</version>
         </dependency>
+        <!-- TODO remove dev dependencies -->
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>1.4.12</version>
+        </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-core</artifactId>
+            <version>1.4.12</version>
+        </dependency>
     </dependencies>
 </project>
diff --git a/src/main/java/com/github/kaktushose/jda/commands/permissions/PermissionsProvider.java b/src/main/java/com/github/kaktushose/jda/commands/permissions/PermissionsProvider.java
index 5dfd8d9c3..54cd209b1 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/permissions/PermissionsProvider.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/permissions/PermissionsProvider.java
@@ -2,14 +2,10 @@
 
 import com.github.kaktushose.jda.commands.annotations.interactions.Permissions;
 import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
-import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.User;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.ArrayList;
-import java.util.List;
-
 /**
  * Interface for performing permission checks.
  *
@@ -40,26 +36,4 @@ public interface PermissionsProvider {
      */
     boolean hasPermission(@NotNull Member member, @NotNull Context context);
 
-    /**
-     * Gets a {@link List} of user ids that map to the given permission string.
-     *
-     * @param guild      the corresponding guild
-     * @param permission the corresponding string
-     * @return a {@link List} of user ids
-     */
-    default List<Long> getUsersWithPermission(Guild guild, String permission) {
-        return new ArrayList<>();
-    }
-
-    /**
-     * Gets a {@link List} of role ids that map to the given permission string.
-     *
-     * @param guild      the corresponding guild
-     * @param permission the corresponding string
-     * @return a {@link List} of role ids
-     */
-    default List<Long> getRolesWithPermission(Guild guild, String permission) {
-        return new ArrayList<>();
-    }
-
 }

From da36e41af0bacdc2cddfbd9aca78c30b5e9d0df5 Mon Sep 17 00:00:00 2001
From: Kaktushose <42280757+Kaktushose@users.noreply.github.com>
Date: Mon, 29 Apr 2024 14:10:02 +0200
Subject: [PATCH 02/38] fix modal defaultValue not being set

---
 .../kaktushose/jda/commands/reflect/TextInputDefinition.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/github/kaktushose/jda/commands/reflect/TextInputDefinition.java b/src/main/java/com/github/kaktushose/jda/commands/reflect/TextInputDefinition.java
index 66471b880..386024e7f 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/reflect/TextInputDefinition.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/reflect/TextInputDefinition.java
@@ -88,7 +88,7 @@ public net.dv8tion.jda.api.interactions.components.text.TextInput toTextInput()
         if (!placeholder.isBlank()) {
             textInput.setPlaceholder(placeholder);
         }
-        if (!placeholder.isBlank()) {
+        if (!defaultValue.isBlank()) {
             textInput.setValue(defaultValue);
         }
 

From 649440b3e890ce30e79be5795ec577c524e08929 Mon Sep 17 00:00:00 2001
From: Kaktushose <42280757+Kaktushose@users.noreply.github.com>
Date: Fri, 10 May 2024 13:39:54 +0200
Subject: [PATCH 03/38] add option to link runtimeId for message builder
 components

---
 .../kaktushose/jda/commands/JDACommands.java  | 59 +++++++++++++++++++
 1 file changed, 59 insertions(+)

diff --git a/src/main/java/com/github/kaktushose/jda/commands/JDACommands.java b/src/main/java/com/github/kaktushose/jda/commands/JDACommands.java
index f973e600d..09f9a3860 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/JDACommands.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/JDACommands.java
@@ -230,6 +230,36 @@ public Button getButton(String button) {
         return buttonDefinition.toButton().withId(buttonDefinition.createCustomId(runtime.getRuntimeId()));
     }
 
+    /**
+     * Gets a JDA {@link Button} to use it for message builders based on the jda-commands id and links it an
+     * existing
+     * {@link com.github.kaktushose.jda.commands.dispatching.RuntimeSupervisor.InteractionRuntime InteractionRuntime}.
+     *
+     *
+     * <p>
+     * The id is made up of the simple class name and the method name. E.g. the id of a button defined by a
+     * {@code onButton(ComponentEvent event)} method inside an {@code ExampleButton} class would be
+     * {@code ExampleButton.onButton}.
+     * </p>
+     *
+     * @param button the id of the button
+     * @param runtimeId  the id of the
+     *                   {@link com.github.kaktushose.jda.commands.dispatching.RuntimeSupervisor.InteractionRuntime InteractionRuntime}
+     * @return a JDA {@link Button}
+     */
+    public Button getButton(String button, String runtimeId) {
+        if (!button.matches("[a-zA-Z]+\\.[a-zA-Z]+")) {
+            throw new IllegalArgumentException("Unknown Button");
+        }
+
+        String sanitizedId = button.replaceAll("\\.", "");
+        ButtonDefinition buttonDefinition = interactionRegistry.getButtons().stream()
+                .filter(it -> it.getDefinitionId().equals(sanitizedId))
+                .findFirst().orElseThrow(() -> new IllegalArgumentException("Unknown Button"));
+
+        return buttonDefinition.toButton().withId(buttonDefinition.createCustomId(runtimeId));
+    }
+
     /**
      * Gets a JDA {@link SelectMenu} to use it for message builders based on the jda-commands id.
      *
@@ -256,6 +286,35 @@ public SelectMenu getSelectMenu(String selectMenu) {
         return selectMenuDefinition.toSelectMenu(runtime.getRuntimeId(), true);
     }
 
+    /**
+     * Gets a JDA {@link SelectMenu} to use it for message builders based on the jda-commands id and links it an
+     * existing
+     * {@link com.github.kaktushose.jda.commands.dispatching.RuntimeSupervisor.InteractionRuntime InteractionRuntime}.
+     *
+     * <p>
+     * The id is made up of the simple class name and the method name. E.g. the id of a a select menu defined by a
+     * {@code onSelectMenu(ComponentEvent event)} method inside an {@code ExampleMenu} class would be
+     * {@code ExampleMenu.onSelectMenu}.
+     * </p>
+     *
+     * @param selectMenu the id of the selectMenu
+     * @param runtimeId  the id of the
+     *                   {@link com.github.kaktushose.jda.commands.dispatching.RuntimeSupervisor.InteractionRuntime InteractionRuntime}
+     * @return a JDA {@link SelectMenu}
+     */
+    public SelectMenu getSelectMenu(String selectMenu, String runtimeId) {
+        if (!selectMenu.matches("[a-zA-Z]+\\.[a-zA-Z]+")) {
+            throw new IllegalArgumentException("Unknown Select Menu");
+        }
+
+        String sanitizedId = selectMenu.replaceAll("\\.", "");
+        GenericSelectMenuDefinition<?> selectMenuDefinition = interactionRegistry.getSelectMenus().stream()
+                .filter(it -> it.getDefinitionId().equals(sanitizedId))
+                .findFirst().orElseThrow(() -> new IllegalArgumentException("Unknown Select Menu"));
+
+        return selectMenuDefinition.toSelectMenu(runtimeId, true);
+    }
+
     /**
      * Gets the {@link ImplementationRegistry}.
      *

From 18635417f1a62fe575b70048d2d874a1beaf8492 Mon Sep 17 00:00:00 2001
From: Kaktushose <42280757+Kaktushose@users.noreply.github.com>
Date: Sun, 2 Jun 2024 14:49:46 +0200
Subject: [PATCH 04/38] improve builder components methods

---
 .../kaktushose/jda/commands/JDACommands.java  | 45 ++++++++++++++--
 .../interactions/GenericEvent.java            | 54 +++++++++++++++++++
 2 files changed, 96 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/github/kaktushose/jda/commands/JDACommands.java b/src/main/java/com/github/kaktushose/jda/commands/JDACommands.java
index 09f9a3860..d6bd23ec7 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/JDACommands.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/JDACommands.java
@@ -242,9 +242,9 @@ public Button getButton(String button) {
      * {@code ExampleButton.onButton}.
      * </p>
      *
-     * @param button the id of the button
-     * @param runtimeId  the id of the
-     *                   {@link com.github.kaktushose.jda.commands.dispatching.RuntimeSupervisor.InteractionRuntime InteractionRuntime}
+     * @param button    the id of the button
+     * @param runtimeId the id of the
+     *                  {@link com.github.kaktushose.jda.commands.dispatching.RuntimeSupervisor.InteractionRuntime InteractionRuntime}
      * @return a JDA {@link Button}
      */
     public Button getButton(String button, String runtimeId) {
@@ -286,6 +286,23 @@ public SelectMenu getSelectMenu(String selectMenu) {
         return selectMenuDefinition.toSelectMenu(runtime.getRuntimeId(), true);
     }
 
+    /**
+     * Gets a JDA {@link SelectMenu} to use it for message builders based on the jda-commands id.
+     *
+     * <p>
+     * The id is made up of the simple class name and the method name. E.g. the id of a a select menu defined by a
+     * {@code onSelectMenu(ComponentEvent event)} method inside an {@code ExampleMenu} class would be
+     * {@code ExampleMenu.onSelectMenu}.
+     * </p>
+     *
+     * @param selectMenu the id of the selectMenu
+     * @param clazz      the subtype of {@link SelectMenu}
+     * @return a JDA {@link SelectMenu}
+     */
+    public <T extends SelectMenu> T getSelectMenu(String selectMenu, Class<T> clazz) {
+        return (T) getSelectMenu(selectMenu);
+    }
+
     /**
      * Gets a JDA {@link SelectMenu} to use it for message builders based on the jda-commands id and links it an
      * existing
@@ -315,6 +332,28 @@ public SelectMenu getSelectMenu(String selectMenu, String runtimeId) {
         return selectMenuDefinition.toSelectMenu(runtimeId, true);
     }
 
+    /**
+     * Gets a JDA {@link SelectMenu} subtype to use it for message builders based on the jda-commands id and links it an
+     * existing
+     * {@link com.github.kaktushose.jda.commands.dispatching.RuntimeSupervisor.InteractionRuntime InteractionRuntime}.
+     *
+     * <p>
+     * The id is made up of the simple class name and the method name. E.g. the id of a a select menu defined by a
+     * {@code onSelectMenu(ComponentEvent event)} method inside an {@code ExampleMenu} class would be
+     * {@code ExampleMenu.onSelectMenu}.
+     * </p>
+     *
+     * @param selectMenu the id of the selectMenu
+     * @param runtimeId  the id of the
+     *                   {@link com.github.kaktushose.jda.commands.dispatching.RuntimeSupervisor.InteractionRuntime
+     *                   InteractionRuntime}
+     * @param clazz      the subtype of {@link SelectMenu}
+     * @return a JDA {@link SelectMenu}
+     */
+    public <T extends SelectMenu> T getSelectMenu(String selectMenu, String runtimeId, Class<T> clazz) {
+        return (T) getSelectMenu(selectMenu, runtimeId);
+    }
+
     /**
      * Gets the {@link ImplementationRegistry}.
      *
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/GenericEvent.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/GenericEvent.java
index 7a81dd311..8c732a70b 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/GenericEvent.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/GenericEvent.java
@@ -3,6 +3,8 @@
 import com.github.kaktushose.jda.commands.JDACommands;
 import com.github.kaktushose.jda.commands.reflect.interactions.GenericInteractionDefinition;
 import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent;
+import net.dv8tion.jda.api.interactions.components.buttons.Button;
+import net.dv8tion.jda.api.interactions.components.selections.SelectMenu;
 
 /**
  * Extension of JDAs {@link GenericInteractionCreateEvent} class. This is the base class for the different event classes.
@@ -56,4 +58,56 @@ public Context getContext() {
     public JDACommands getJdaCommands() {
         return context.getJdaCommands();
     }
+
+    /**
+     * Gets a JDA {@link Button} to use it for message builders based on the jda-commands id. The returned button will
+     * be linked to the runtime of this event.
+     *
+     * <p>
+     * The id is made up of the simple class name and the method name. E.g. the id of a button defined by a
+     * {@code onButton(ComponentEvent event)} method inside an {@code ExampleButton} class would be
+     * {@code ExampleButton.onButton}.
+     * </p>
+     *
+     * @param button the id of the button
+     * @return a JDA {@link Button}
+     */
+    public Button getButton(String button) {
+        return getJdaCommands().getButton(button, context.getRuntime().getRuntimeId());
+    }
+
+    /**
+     * Gets a JDA {@link SelectMenu} to use it for message builders based on the jda-commands id. The returned
+     * SelectMenu will be linked to the runtime of this event.
+     *
+     * <p>
+     * The id is made up of the simple class name and the method name. E.g. the id of a a select menu defined by a
+     * {@code onSelectMenu(ComponentEvent event)} method inside an {@code ExampleMenu} class would be
+     * {@code ExampleMenu.onSelectMenu}.
+     * </p>
+     *
+     * @param menu the id of the selectMenu
+     * @return a JDA {@link SelectMenu}
+     */
+    public SelectMenu getSelectMenu(String menu) {
+        return getJdaCommands().getSelectMenu(menu, context.getRuntime().getRuntimeId());
+    }
+
+    /**
+     * Gets a JDA {@link SelectMenu} to use it for message builders based on the jda-commands id. The returned
+     * SelectMenu will be linked to the runtime of this event.
+     *
+     * <p>
+     * The id is made up of the simple class name and the method name. E.g. the id of a a select menu defined by a
+     * {@code onSelectMenu(ComponentEvent event)} method inside an {@code ExampleMenu} class would be
+     * {@code ExampleMenu.onSelectMenu}.
+     * </p>
+     *
+     * @param menu  the id of the selectMenu
+     * @param clazz the subtype of {@link SelectMenu}
+     * @return a JDA {@link SelectMenu}
+     */
+    public <S extends SelectMenu> S getSelectMenu(String menu, Class<S> clazz) {
+        return getJdaCommands().getSelectMenu(menu, getContext().getRuntime().getRuntimeId(), clazz);
+    }
 }

From 04ff5c267d14b77582772071697eb6cb495dd897 Mon Sep 17 00:00:00 2001
From: Kaktushose <42280757+Kaktushose@users.noreply.github.com>
Date: Thu, 4 Jul 2024 10:52:57 +0200
Subject: [PATCH 05/38] properly escape string replacements

---
 .../jda/commands/data/EmbedDTO.java           | 29 ++++++++++---------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/github/kaktushose/jda/commands/data/EmbedDTO.java b/src/main/java/com/github/kaktushose/jda/commands/data/EmbedDTO.java
index 7c394019a..f4b561366 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/data/EmbedDTO.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/data/EmbedDTO.java
@@ -10,6 +10,7 @@
 import java.time.ZonedDateTime;
 import java.util.Arrays;
 import java.util.Map;
+import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 /**
@@ -279,56 +280,56 @@ public EmbedDTO injectValues(Map<String, Object> values) {
      */
     public EmbedDTO injectValue(String name, Object object) {
         if (title != null) {
-            title = title.replaceAll(String.format(Pattern.quote("{%s}"), name), String.valueOf(object));
+            title = title.replaceAll(String.format(Pattern.quote("{%s}"), Matcher.quoteReplacement(name)), String.valueOf(object));
         }
         if (description != null) {
-            description = description.replaceAll(String.format(Pattern.quote("{%s}"), name), String.valueOf(object));
+            description = description.replaceAll(String.format(Pattern.quote("{%s}"), Matcher.quoteReplacement(name)), String.valueOf(object));
         }
         if (url != null) {
-            url = url.replaceAll(String.format(Pattern.quote("{%s}"), name), String.valueOf(object));
+            url = url.replaceAll(String.format(Pattern.quote("{%s}"), Matcher.quoteReplacement(name)), String.valueOf(object));
         }
         if (color != null) {
-            color = color.replaceAll(String.format(Pattern.quote("{%s}"), name), String.valueOf(object));
+            color = color.replaceAll(String.format(Pattern.quote("{%s}"), Matcher.quoteReplacement(name)), String.valueOf(object));
         }
         if (timestamp != null) {
-            timestamp = timestamp.replaceAll(String.format(Pattern.quote("{%s}"), name), String.valueOf(object));
+            timestamp = timestamp.replaceAll(String.format(Pattern.quote("{%s}"), Matcher.quoteReplacement(name)), String.valueOf(object));
         }
         if (footer != null) {
             if (footer.iconUrl != null) {
-                footer.iconUrl = footer.iconUrl.replaceAll(String.format(Pattern.quote("{%s}"), name), String.valueOf(object));
+                footer.iconUrl = footer.iconUrl.replaceAll(String.format(Pattern.quote("{%s}"), Matcher.quoteReplacement(name)), String.valueOf(object));
             }
             if (footer.text != null) {
-                footer.text = footer.text.replaceAll(String.format(Pattern.quote("{%s}"), name), String.valueOf(object));
+                footer.text = footer.text.replaceAll(String.format(Pattern.quote("{%s}"), Matcher.quoteReplacement(name)), String.valueOf(object));
             }
         }
         if (thumbnail != null) {
             if (thumbnail.url != null) {
-                thumbnail.url = thumbnail.url.replaceAll(String.format(Pattern.quote("{%s}"), name), String.valueOf(object));
+                thumbnail.url = thumbnail.url.replaceAll(String.format(Pattern.quote("{%s}"), Matcher.quoteReplacement(name)), String.valueOf(object));
             }
         }
         if (image != null) {
             if (image.url != null) {
-                image.url = image.url.replaceAll(String.format(Pattern.quote("{%s}"), name), String.valueOf(object));
+                image.url = image.url.replaceAll(String.format(Pattern.quote("{%s}"), Matcher.quoteReplacement(name)), String.valueOf(object));
             }
         }
         if (author != null) {
             if (author.iconUrl != null) {
-                author.iconUrl = author.iconUrl.replaceAll(String.format(Pattern.quote("{%s}"), name), String.valueOf(object));
+                author.iconUrl = author.iconUrl.replaceAll(String.format(Pattern.quote("{%s}"), Matcher.quoteReplacement(name)), String.valueOf(object));
             }
             if (author.name != null) {
-                author.name = author.name.replaceAll(String.format(Pattern.quote("{%s}"), name), String.valueOf(object));
+                author.name = author.name.replaceAll(String.format(Pattern.quote("{%s}"), Matcher.quoteReplacement(name)), String.valueOf(object));
             }
             if (author.url != null) {
-                author.url = author.url.replaceAll(String.format(Pattern.quote("{%s}"), name), String.valueOf(object));
+                author.url = author.url.replaceAll(String.format(Pattern.quote("{%s}"), Matcher.quoteReplacement(name)), String.valueOf(object));
             }
         }
         if (fields != null) {
             for (Field field : fields) {
                 if (field.name != null) {
-                    field.name = field.name.replaceAll(String.format(Pattern.quote("{%s}"), name), String.valueOf(object));
+                    field.name = field.name.replaceAll(String.format(Pattern.quote("{%s}"), Matcher.quoteReplacement(name)), String.valueOf(object));
                 }
                 if (field.value != null) {
-                    field.value = field.value.replaceAll(String.format(Pattern.quote("{%s}"), name), String.valueOf(object));
+                    field.value = field.value.replaceAll(String.format(Pattern.quote("{%s}"), Matcher.quoteReplacement(name)), String.valueOf(object));
                 }
             }
         }

From 5bc8482d6438b536e6ded174d8599f7b4027e7af Mon Sep 17 00:00:00 2001
From: Kaktushose <42280757+Kaktushose@users.noreply.github.com>
Date: Sun, 4 Aug 2024 17:35:49 +0200
Subject: [PATCH 06/38] bump jda version and fix reply bug [#137]

---
 pom.xml                                                   | 2 +-
 .../jda/commands/dispatching/reply/Replyable.java         | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index ffa45b1b0..ac3c0ae15 100644
--- a/pom.xml
+++ b/pom.xml
@@ -66,7 +66,7 @@
         <dependency>
             <groupId>net.dv8tion</groupId>
             <artifactId>JDA</artifactId>
-            <version>5.0.0-beta.22</version>
+            <version>5.0.2</version>
             <exclusions>
                 <exclusion>
                     <groupId>club.minnced</groupId>
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/Replyable.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/Replyable.java
index 2808b1842..e844403c6 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/Replyable.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/Replyable.java
@@ -97,7 +97,7 @@ default void reply(@NotNull EmbedDTO embedDTO) {
      * @see <a href="https://ci.dv8tion.net/job/JDA/javadoc/net/dv8tion/jda/api/requests/RestAction.html">JDA RestAction Documentation</a>
      */
     default void reply(@NotNull String message, @Nullable Consumer<Message> success) {
-        reply(message);
+        getReplyContext().getBuilder().setContent(message);
         setSuccessCallback(success);
         reply();
     }
@@ -111,7 +111,7 @@ default void reply(@NotNull String message, @Nullable Consumer<Message> success)
      * @see <a href="https://ci.dv8tion.net/job/JDA/javadoc/net/dv8tion/jda/api/requests/RestAction.html">JDA RestAction Documentation</a>
      */
     default void reply(@NotNull MessageCreateData message, @Nullable Consumer<Message> success) {
-        reply(message);
+        getReplyContext().getBuilder().applyData(message);
         setSuccessCallback(success);
         reply();
     }
@@ -125,7 +125,7 @@ default void reply(@NotNull MessageCreateData message, @Nullable Consumer<Messag
      * @see <a href="https://ci.dv8tion.net/job/JDA/javadoc/net/dv8tion/jda/api/requests/RestAction.html">JDA RestAction Documentation</a>
      */
     default void reply(@NotNull EmbedBuilder builder, @Nullable Consumer<Message> success) {
-        reply(builder);
+        getReplyContext().getBuilder().setEmbeds(builder.build());
         setSuccessCallback(success);
         reply();
     }
@@ -139,7 +139,7 @@ default void reply(@NotNull EmbedBuilder builder, @Nullable Consumer<Message> su
      * @see <a href="https://ci.dv8tion.net/job/JDA/javadoc/net/dv8tion/jda/api/requests/RestAction.html">JDA RestAction Documentation</a>
      */
     default void reply(@NotNull EmbedDTO embedDTO, @Nullable Consumer<Message> success) {
-        reply(embedDTO);
+        getReplyContext().getBuilder().setEmbeds(embedDTO.toMessageEmbed());
         setSuccessCallback(success);
         reply();
     }

From 90bf1148b57760950a81ccf1743d050c68925776 Mon Sep 17 00:00:00 2001
From: Kaktushose <42280757+Kaktushose@users.noreply.github.com>
Date: Sun, 4 Aug 2024 17:42:02 +0200
Subject: [PATCH 07/38] fix unit tests

---
 src/test/java/adapting/mock/GuildMock.java  |  2 +-
 src/test/java/adapting/mock/JDAMock.java    | 26 +++++++++++++++++++++
 src/test/java/adapting/mock/MemberMock.java |  6 -----
 3 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/src/test/java/adapting/mock/GuildMock.java b/src/test/java/adapting/mock/GuildMock.java
index 4701b0110..6e6340ea2 100644
--- a/src/test/java/adapting/mock/GuildMock.java
+++ b/src/test/java/adapting/mock/GuildMock.java
@@ -128,7 +128,7 @@ public AuditableRestAction<Void> ban(@NotNull UserSnowflake user, int deletionTi
 
     @NotNull
     @Override
-    public AuditableRestAction<BulkBanResponse> ban(@NotNull Collection<UserSnowflake> collection, @Nullable Duration duration) {
+    public AuditableRestAction<BulkBanResponse> ban(@NotNull Collection<? extends UserSnowflake> users, @Nullable Duration deletionTime) {
         return null;
     }
 
diff --git a/src/test/java/adapting/mock/JDAMock.java b/src/test/java/adapting/mock/JDAMock.java
index d209a5542..5e840d744 100644
--- a/src/test/java/adapting/mock/JDAMock.java
+++ b/src/test/java/adapting/mock/JDAMock.java
@@ -9,6 +9,7 @@
 import net.dv8tion.jda.api.entities.sticker.StickerPack;
 import net.dv8tion.jda.api.entities.sticker.StickerSnowflake;
 import net.dv8tion.jda.api.entities.sticker.StickerUnion;
+import net.dv8tion.jda.api.events.GenericEvent;
 import net.dv8tion.jda.api.exceptions.ErrorResponseException;
 import net.dv8tion.jda.api.hooks.IEventManager;
 import net.dv8tion.jda.api.interactions.commands.Command;
@@ -23,6 +24,7 @@
 import net.dv8tion.jda.api.requests.restaction.*;
 import net.dv8tion.jda.api.requests.restaction.pagination.EntitlementPaginationAction;
 import net.dv8tion.jda.api.sharding.ShardManager;
+import net.dv8tion.jda.api.utils.Once;
 import net.dv8tion.jda.api.utils.cache.CacheFlag;
 import net.dv8tion.jda.api.utils.cache.CacheView;
 import net.dv8tion.jda.api.utils.cache.ChannelCacheView;
@@ -162,6 +164,12 @@ public List<Object> getRegisteredListeners() {
         return null;
     }
 
+    @NotNull
+    @Override
+    public <E extends GenericEvent> Once.Builder<E> listenOnce(@NotNull Class<E> eventType) {
+        return null;
+    }
+
     @NotNull
     @Override
     public RestAction<List<Command>> retrieveCommands() {
@@ -452,6 +460,24 @@ public EntitlementPaginationAction retrieveEntitlements() {
         return null;
     }
 
+    @NotNull
+    @Override
+    public RestAction<Entitlement> retrieveEntitlementById(long entitlementId) {
+        return null;
+    }
+
+    @NotNull
+    @Override
+    public TestEntitlementCreateAction createTestEntitlement(long skuId, long ownerId, @NotNull TestEntitlementCreateAction.OwnerType ownerType) {
+        return null;
+    }
+
+    @NotNull
+    @Override
+    public RestAction<Void> deleteTestEntitlement(long entitlementId) {
+        return null;
+    }
+
     @NotNull
     @Override
     public JDA setRequiredScopes(@NotNull Collection<String> collection) {
diff --git a/src/test/java/adapting/mock/MemberMock.java b/src/test/java/adapting/mock/MemberMock.java
index ad5ca995a..9b7563280 100644
--- a/src/test/java/adapting/mock/MemberMock.java
+++ b/src/test/java/adapting/mock/MemberMock.java
@@ -255,12 +255,6 @@ public AuditableRestAction<Void> kick() {
         return Member.super.kick();
     }
 
-    @NotNull
-    @Override
-    public AuditableRestAction<Void> kick(@Nullable String reason) {
-        return Member.super.kick(reason);
-    }
-
     @NotNull
     @Override
     public AuditableRestAction<Void> mute(boolean mute) {

From d1e7cb62293fff0ba56214875eea12ae8bec5f4b Mon Sep 17 00:00:00 2001
From: Kaktushose <42280757+Kaktushose@users.noreply.github.com>
Date: Wed, 7 Aug 2024 18:11:20 +0200
Subject: [PATCH 08/38] update JsonErrorMessageFactory to use new
 executionFailed embed format

---
 src/examples/embeds.json                              |  8 +++++++-
 .../jda/commands/embeds/JsonErrorMessageFactory.java  | 11 ++++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/examples/embeds.json b/src/examples/embeds.json
index 25d070914..11da18637 100644
--- a/src/examples/embeds.json
+++ b/src/examples/embeds.json
@@ -42,7 +42,13 @@
   },
   "executionFailed": {
     "title": "Command Execution Failed",
-    "description": "```exception```",
+    "description": "The command execution has unexpectedly failed. Please report the following error to the bot devs.",
+    "fields": [
+      {
+        "name": "Error Message",
+        "value": "{error}"
+      }
+    ],
     "color": "#ff0000"
   },
   "unknownInteraction": {
diff --git a/src/main/java/com/github/kaktushose/jda/commands/embeds/JsonErrorMessageFactory.java b/src/main/java/com/github/kaktushose/jda/commands/embeds/JsonErrorMessageFactory.java
index 3cb381d9b..be7186167 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/embeds/JsonErrorMessageFactory.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/embeds/JsonErrorMessageFactory.java
@@ -10,6 +10,7 @@
 import net.dv8tion.jda.api.utils.messages.MessageCreateData;
 import org.jetbrains.annotations.NotNull;
 
+import java.text.SimpleDateFormat;
 import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
@@ -118,8 +119,16 @@ public MessageCreateData getCommandExecutionFailedMessage(@NotNull Context conte
         if (!embedCache.containsEmbed("executionFailed")) {
             return super.getCommandExecutionFailedMessage(context, exception);
         }
+        String error = String.format("```The user \"%s\" attempted to execute an \"%s\" interaction at %s, " +
+                              "but a \"%s\" occurred. " +
+                              "Please refer to the logs for further information.```",
+                context.getEvent().getUser().toString(),
+                context.getEvent().getInteraction().getType(),
+                new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(System.currentTimeMillis()),
+                exception.getClass().getName()
+        );
         return embedCache.getEmbed("executionFailed")
-                .injectValue("exception", exception.toString())
+                .injectValue("error", error)
                 .toMessageCreateData();
     }
 

From 37ee8b06ecb5dd441c7615a6f47042fe67b62828 Mon Sep 17 00:00:00 2001
From: Kaktushose <42280757+Kaktushose@users.noreply.github.com>
Date: Mon, 25 Nov 2024 14:22:29 +0100
Subject: [PATCH 09/38] fix guild commands not registering

---
 .../kaktushose/jda/commands/JDACommands.java  |  3 +-
 .../jda/commands/SlashCommandUpdater.java     | 99 ++++++++-----------
 2 files changed, 44 insertions(+), 58 deletions(-)

diff --git a/src/main/java/com/github/kaktushose/jda/commands/JDACommands.java b/src/main/java/com/github/kaktushose/jda/commands/JDACommands.java
index d6bd23ec7..27d18b48b 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/JDACommands.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/JDACommands.java
@@ -80,8 +80,7 @@ private JDACommands(Object jda, Class<?> clazz, LocalizationFunction function, D
         interactionRegistry.index(clazz, packages);
 
         updater = new SlashCommandUpdater(this);
-        updater.updateGlobalCommands();
-        jdaContext.performTask(it -> it.addEventListener(dispatcherSupervisor));
+        updater.updateAllCommands();
 
         isActive = true;
         log.info("Finished loading!");
diff --git a/src/main/java/com/github/kaktushose/jda/commands/SlashCommandUpdater.java b/src/main/java/com/github/kaktushose/jda/commands/SlashCommandUpdater.java
index 89b0c1a32..ccbe5ea52 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/SlashCommandUpdater.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/SlashCommandUpdater.java
@@ -7,12 +7,9 @@
 import com.github.kaktushose.jda.commands.reflect.interactions.commands.SlashCommandDefinition;
 import com.github.kaktushose.jda.commands.scope.GuildScopeProvider;
 import net.dv8tion.jda.api.entities.Guild;
-import net.dv8tion.jda.api.events.guild.GuildReadyEvent;
-import net.dv8tion.jda.api.hooks.ListenerAdapter;
 import net.dv8tion.jda.api.interactions.commands.Command;
 import net.dv8tion.jda.api.interactions.commands.build.CommandData;
 import net.dv8tion.jda.api.interactions.commands.build.SlashCommandData;
-import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -26,13 +23,12 @@
  * @see CommandTree
  * @since 2.3.0
  */
-public class SlashCommandUpdater extends ListenerAdapter {
+public class SlashCommandUpdater {
 
     private static final Logger log = LoggerFactory.getLogger(SlashCommandUpdater.class);
     private final JDAContext jdaContext;
     private final GuildScopeProvider guildScopeProvider;
     private final InteractionRegistry interactionRegistry;
-    private Map<Long, Set<CommandData>> guildMapping;
 
     /**
      * Constructs a new SlashCommandUpdater.
@@ -43,47 +39,6 @@ public SlashCommandUpdater(JDACommands jdaCommands) {
         this.jdaContext = jdaCommands.getJDAContext();
         guildScopeProvider = jdaCommands.getImplementationRegistry().getGuildScopeProvider();
         interactionRegistry = jdaCommands.getInteractionRegistry();
-        guildMapping = getGuildMapping();
-    }
-
-    private Map<Long, Set<CommandData>> getGuildMapping() {
-        Set<GenericCommandDefinition> guildCommands = interactionRegistry.getCommands()
-                .stream()
-                .filter(it -> it.getCommandScope() == SlashCommand.CommandScope.GUILD)
-                .collect(Collectors.toSet());
-
-        CommandTree tree = new CommandTree(
-                guildCommands.stream()
-                        .filter(it -> it.getCommandType() == Command.Type.SLASH)
-                        .map(it -> (SlashCommandDefinition) it)
-                        .collect(Collectors.toSet())
-        );
-        log.debug("Generated slash command tree:\n" + tree);
-
-        Set<CommandData> result = new HashSet<>();
-        result.addAll(tree.getCommands());
-        result.addAll(guildCommands.stream().
-                filter(it -> (it.getCommandType() == Command.Type.USER || it.getCommandType() == Command.Type.MESSAGE))
-                .map(GenericCommandDefinition::toCommandData)
-                .collect(Collectors.toSet())
-        );
-        log.debug("Registering commands: " + result.stream().map(CommandData::getName).collect(Collectors.toSet()));
-
-        Map<Long, Set<CommandData>> guildMapping = new HashMap<>();
-        for (CommandData command : result) {
-            // create a copy so that a user doesn't modify the command data used for registration
-            Set<Long> guildIds = guildScopeProvider.getGuildsForCommand(CommandData.fromData(command.toData()));
-            if (guildIds.isEmpty()) {
-                log.debug("No guilds provided for command {}", command.getName());
-            } else {
-                log.debug("Using guilds {} for command {}", guildIds, command.getName());
-            }
-            guildIds.forEach(id -> {
-                guildMapping.putIfAbsent(id, new HashSet<>());
-                guildMapping.get(id).add(command);
-            });
-        }
-        return guildMapping;
     }
 
     /**
@@ -100,12 +55,12 @@ public void updateAllCommands() {
      */
     public void updateGuildCommands() {
         log.debug("Updating guild commands...");
-        guildMapping = getGuildMapping();
+        Map<Long, Set<CommandData>> guildMapping = getGuildMapping();
         for (Guild guild : jdaContext.getGuildCache()) {
             Set<CommandData> commands = guildMapping.getOrDefault(guild.getIdLong(), Collections.emptySet());
             guild.updateCommands().addCommands(commands).queue();
+            log.debug(String.format("Registered guild command(s) %s for %s", commands.stream().map(CommandData::getName).collect(Collectors.toSet()), guild));
         }
-        log.debug("Done!");
     }
 
     /**
@@ -125,7 +80,7 @@ public void updateGlobalCommands() {
                         .map(it -> (SlashCommandDefinition) it)
                         .collect(Collectors.toSet())
         );
-        log.debug("Generated slash command tree:\n" + tree);
+        log.debug("Generated slash command tree with CommandScope.GLOBAL:\n" + tree);
 
         Set<CommandData> result = new HashSet<>();
         result.addAll(tree.getCommands());
@@ -134,16 +89,48 @@ public void updateGlobalCommands() {
                 .map(GenericCommandDefinition::toCommandData)
                 .collect(Collectors.toSet())
         );
-        log.debug("Registering commands: " + result.stream().map(CommandData::getName).collect(Collectors.toSet()));
+        log.debug("Registered global command(s): " + result.stream().map(CommandData::getName).collect(Collectors.toSet()));
 
         jdaContext.performTask(jda -> jda.updateCommands().addCommands(result).queue());
-        log.debug("Done!");
     }
 
-    @Override
-    public void onGuildReady(@NotNull GuildReadyEvent event) {
-        Guild guild = event.getGuild();
-        Set<CommandData> commands = guildMapping.getOrDefault(guild.getIdLong(), Collections.emptySet());
-        guild.updateCommands().addCommands(commands).queue();
+    private Map<Long, Set<CommandData>> getGuildMapping() {
+        Set<GenericCommandDefinition> guildCommands = interactionRegistry.getCommands()
+                .stream()
+                .filter(it -> it.getCommandScope() == SlashCommand.CommandScope.GUILD)
+                .collect(Collectors.toSet());
+
+        CommandTree tree = new CommandTree(
+                guildCommands.stream()
+                        .filter(it -> it.getCommandType() == Command.Type.SLASH)
+                        .map(it -> (SlashCommandDefinition) it)
+                        .collect(Collectors.toSet())
+        );
+        log.debug("Generated slash command tree with CommandScope.GUILD:\n" + tree);
+
+        Set<CommandData> result = new HashSet<>();
+        result.addAll(tree.getCommands());
+        result.addAll(guildCommands.stream().
+                filter(it -> (it.getCommandType() == Command.Type.USER || it.getCommandType() == Command.Type.MESSAGE))
+                .map(GenericCommandDefinition::toCommandData)
+                .collect(Collectors.toSet())
+        );
+        log.debug("Interactions eligible for registration: " + result.stream().map(CommandData::getName).collect(Collectors.toSet()));
+
+        Map<Long, Set<CommandData>> guildMapping = new HashMap<>();
+        for (CommandData command : result) {
+            // create a copy so that a user doesn't modify the command data used for registration
+            Set<Long> guildIds = guildScopeProvider.getGuildsForCommand(CommandData.fromData(command.toData()));
+            if (guildIds.isEmpty()) {
+                log.debug("No guilds provided for command \"{}\"", command.getName());
+            } else {
+                log.debug("Using guild(s) {} for command \"{}\"", guildIds, command.getName());
+            }
+            guildIds.forEach(id -> {
+                guildMapping.putIfAbsent(id, new HashSet<>());
+                guildMapping.get(id).add(command);
+            });
+        }
+        return guildMapping;
     }
 }

From aa52965bb229ebc5fd0fd1d200ee0b9308982b9a Mon Sep 17 00:00:00 2001
From: Kaktushose <42280757+Kaktushose@users.noreply.github.com>
Date: Mon, 25 Nov 2024 14:22:29 +0100
Subject: [PATCH 10/38] fix guild commands not registering

---
 .../kaktushose/jda/commands/JDACommands.java  |  2 +-
 .../jda/commands/SlashCommandUpdater.java     | 99 ++++++++-----------
 2 files changed, 44 insertions(+), 57 deletions(-)

diff --git a/src/main/java/com/github/kaktushose/jda/commands/JDACommands.java b/src/main/java/com/github/kaktushose/jda/commands/JDACommands.java
index d6bd23ec7..e1165047e 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/JDACommands.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/JDACommands.java
@@ -80,7 +80,7 @@ private JDACommands(Object jda, Class<?> clazz, LocalizationFunction function, D
         interactionRegistry.index(clazz, packages);
 
         updater = new SlashCommandUpdater(this);
-        updater.updateGlobalCommands();
+        updater.updateAllCommands();
         jdaContext.performTask(it -> it.addEventListener(dispatcherSupervisor));
 
         isActive = true;
diff --git a/src/main/java/com/github/kaktushose/jda/commands/SlashCommandUpdater.java b/src/main/java/com/github/kaktushose/jda/commands/SlashCommandUpdater.java
index 89b0c1a32..ccbe5ea52 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/SlashCommandUpdater.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/SlashCommandUpdater.java
@@ -7,12 +7,9 @@
 import com.github.kaktushose.jda.commands.reflect.interactions.commands.SlashCommandDefinition;
 import com.github.kaktushose.jda.commands.scope.GuildScopeProvider;
 import net.dv8tion.jda.api.entities.Guild;
-import net.dv8tion.jda.api.events.guild.GuildReadyEvent;
-import net.dv8tion.jda.api.hooks.ListenerAdapter;
 import net.dv8tion.jda.api.interactions.commands.Command;
 import net.dv8tion.jda.api.interactions.commands.build.CommandData;
 import net.dv8tion.jda.api.interactions.commands.build.SlashCommandData;
-import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -26,13 +23,12 @@
  * @see CommandTree
  * @since 2.3.0
  */
-public class SlashCommandUpdater extends ListenerAdapter {
+public class SlashCommandUpdater {
 
     private static final Logger log = LoggerFactory.getLogger(SlashCommandUpdater.class);
     private final JDAContext jdaContext;
     private final GuildScopeProvider guildScopeProvider;
     private final InteractionRegistry interactionRegistry;
-    private Map<Long, Set<CommandData>> guildMapping;
 
     /**
      * Constructs a new SlashCommandUpdater.
@@ -43,47 +39,6 @@ public SlashCommandUpdater(JDACommands jdaCommands) {
         this.jdaContext = jdaCommands.getJDAContext();
         guildScopeProvider = jdaCommands.getImplementationRegistry().getGuildScopeProvider();
         interactionRegistry = jdaCommands.getInteractionRegistry();
-        guildMapping = getGuildMapping();
-    }
-
-    private Map<Long, Set<CommandData>> getGuildMapping() {
-        Set<GenericCommandDefinition> guildCommands = interactionRegistry.getCommands()
-                .stream()
-                .filter(it -> it.getCommandScope() == SlashCommand.CommandScope.GUILD)
-                .collect(Collectors.toSet());
-
-        CommandTree tree = new CommandTree(
-                guildCommands.stream()
-                        .filter(it -> it.getCommandType() == Command.Type.SLASH)
-                        .map(it -> (SlashCommandDefinition) it)
-                        .collect(Collectors.toSet())
-        );
-        log.debug("Generated slash command tree:\n" + tree);
-
-        Set<CommandData> result = new HashSet<>();
-        result.addAll(tree.getCommands());
-        result.addAll(guildCommands.stream().
-                filter(it -> (it.getCommandType() == Command.Type.USER || it.getCommandType() == Command.Type.MESSAGE))
-                .map(GenericCommandDefinition::toCommandData)
-                .collect(Collectors.toSet())
-        );
-        log.debug("Registering commands: " + result.stream().map(CommandData::getName).collect(Collectors.toSet()));
-
-        Map<Long, Set<CommandData>> guildMapping = new HashMap<>();
-        for (CommandData command : result) {
-            // create a copy so that a user doesn't modify the command data used for registration
-            Set<Long> guildIds = guildScopeProvider.getGuildsForCommand(CommandData.fromData(command.toData()));
-            if (guildIds.isEmpty()) {
-                log.debug("No guilds provided for command {}", command.getName());
-            } else {
-                log.debug("Using guilds {} for command {}", guildIds, command.getName());
-            }
-            guildIds.forEach(id -> {
-                guildMapping.putIfAbsent(id, new HashSet<>());
-                guildMapping.get(id).add(command);
-            });
-        }
-        return guildMapping;
     }
 
     /**
@@ -100,12 +55,12 @@ public void updateAllCommands() {
      */
     public void updateGuildCommands() {
         log.debug("Updating guild commands...");
-        guildMapping = getGuildMapping();
+        Map<Long, Set<CommandData>> guildMapping = getGuildMapping();
         for (Guild guild : jdaContext.getGuildCache()) {
             Set<CommandData> commands = guildMapping.getOrDefault(guild.getIdLong(), Collections.emptySet());
             guild.updateCommands().addCommands(commands).queue();
+            log.debug(String.format("Registered guild command(s) %s for %s", commands.stream().map(CommandData::getName).collect(Collectors.toSet()), guild));
         }
-        log.debug("Done!");
     }
 
     /**
@@ -125,7 +80,7 @@ public void updateGlobalCommands() {
                         .map(it -> (SlashCommandDefinition) it)
                         .collect(Collectors.toSet())
         );
-        log.debug("Generated slash command tree:\n" + tree);
+        log.debug("Generated slash command tree with CommandScope.GLOBAL:\n" + tree);
 
         Set<CommandData> result = new HashSet<>();
         result.addAll(tree.getCommands());
@@ -134,16 +89,48 @@ public void updateGlobalCommands() {
                 .map(GenericCommandDefinition::toCommandData)
                 .collect(Collectors.toSet())
         );
-        log.debug("Registering commands: " + result.stream().map(CommandData::getName).collect(Collectors.toSet()));
+        log.debug("Registered global command(s): " + result.stream().map(CommandData::getName).collect(Collectors.toSet()));
 
         jdaContext.performTask(jda -> jda.updateCommands().addCommands(result).queue());
-        log.debug("Done!");
     }
 
-    @Override
-    public void onGuildReady(@NotNull GuildReadyEvent event) {
-        Guild guild = event.getGuild();
-        Set<CommandData> commands = guildMapping.getOrDefault(guild.getIdLong(), Collections.emptySet());
-        guild.updateCommands().addCommands(commands).queue();
+    private Map<Long, Set<CommandData>> getGuildMapping() {
+        Set<GenericCommandDefinition> guildCommands = interactionRegistry.getCommands()
+                .stream()
+                .filter(it -> it.getCommandScope() == SlashCommand.CommandScope.GUILD)
+                .collect(Collectors.toSet());
+
+        CommandTree tree = new CommandTree(
+                guildCommands.stream()
+                        .filter(it -> it.getCommandType() == Command.Type.SLASH)
+                        .map(it -> (SlashCommandDefinition) it)
+                        .collect(Collectors.toSet())
+        );
+        log.debug("Generated slash command tree with CommandScope.GUILD:\n" + tree);
+
+        Set<CommandData> result = new HashSet<>();
+        result.addAll(tree.getCommands());
+        result.addAll(guildCommands.stream().
+                filter(it -> (it.getCommandType() == Command.Type.USER || it.getCommandType() == Command.Type.MESSAGE))
+                .map(GenericCommandDefinition::toCommandData)
+                .collect(Collectors.toSet())
+        );
+        log.debug("Interactions eligible for registration: " + result.stream().map(CommandData::getName).collect(Collectors.toSet()));
+
+        Map<Long, Set<CommandData>> guildMapping = new HashMap<>();
+        for (CommandData command : result) {
+            // create a copy so that a user doesn't modify the command data used for registration
+            Set<Long> guildIds = guildScopeProvider.getGuildsForCommand(CommandData.fromData(command.toData()));
+            if (guildIds.isEmpty()) {
+                log.debug("No guilds provided for command \"{}\"", command.getName());
+            } else {
+                log.debug("Using guild(s) {} for command \"{}\"", guildIds, command.getName());
+            }
+            guildIds.forEach(id -> {
+                guildMapping.putIfAbsent(id, new HashSet<>());
+                guildMapping.get(id).add(command);
+            });
+        }
+        return guildMapping;
     }
 }

From fce1488337f6b585edd90aaf351187f3bb1214a1 Mon Sep 17 00:00:00 2001
From: Kaktushose <42280757+Kaktushose@users.noreply.github.com>
Date: Fri, 29 Nov 2024 20:17:02 +0100
Subject: [PATCH 11/38] improve documentation

---
 .../jda/commands/reflect/InteractionRegistry.java     | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/github/kaktushose/jda/commands/reflect/InteractionRegistry.java b/src/main/java/com/github/kaktushose/jda/commands/reflect/InteractionRegistry.java
index 2c66e5cd3..5d41a5f4a 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/reflect/InteractionRegistry.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/reflect/InteractionRegistry.java
@@ -129,7 +129,8 @@ public Set<InteractionControllerDefinition> getInteractionControllers() {
     }
 
     /**
-     * Gets a possibly-empty list of all {@link GenericCommandDefinition CommandDefinitions}.
+     * Gets a possibly-empty list of all {@link GenericCommandDefinition CommandDefinitions}, this includes both
+     * {@link SlashCommandDefinition} and {@link ContextCommandDefinition}.
      *
      * @return a possibly-empty list of all {@link GenericCommandDefinition CommandDefinitions}
      */
@@ -138,9 +139,9 @@ public Set<GenericCommandDefinition> getCommands() {
     }
 
     /**
-     * Gets a possibly-empty list of all {@link SlashCommandDefinition CommandDefinitions}.
+     * Gets a possibly-empty list of all {@link SlashCommandDefinition SlashCommandDefinitions}.
      *
-     * @return a possibly-empty list of all {@link SlashCommandDefinition CommandDefinitions}
+     * @return a possibly-empty list of all {@link SlashCommandDefinition SlashCommandDefinitions}
      */
     public Set<SlashCommandDefinition> getSlashCommands() {
         return commands.stream().filter(it -> (it.getCommandType() == Command.Type.SLASH))
@@ -149,9 +150,9 @@ public Set<SlashCommandDefinition> getSlashCommands() {
     }
 
     /**
-     * Gets a possibly-empty list of all {@link ContextCommandDefinition CommandDefinitions}.
+     * Gets a possibly-empty list of all {@link ContextCommandDefinition ContextCommandDefinitions}.
      *
-     * @return a possibly-empty list of all {@link ContextCommandDefinition CommandDefinitions}
+     * @return a possibly-empty list of all {@link ContextCommandDefinition ContextCommandDefinitions}
      */
     public Set<ContextCommandDefinition> getContextCommands() {
         return commands.stream().filter(it ->

From c1ab4dfe5b8c8d06baf120c44bf0f35d4602b728 Mon Sep 17 00:00:00 2001
From: Nick Hensel <47005420+Goldmensch@users.noreply.github.com>
Date: Wed, 4 Dec 2024 21:27:16 +0100
Subject: [PATCH 12/38] Bump to java 23 and refactoring (#140)

* Refactor part of reflect package and JDACommands.java

* fix compile errors and unit tests

* fix incorrect java version in ci

* bump jacoco version

* remove isActive functionality

* fix auto complete dispatching

* move parameter validation to helper methods

* Make AutoCompleteDefinition and SlashCommandDefinition immutable

* Refactor tree

* fix unit tests

* make getComponent methods accessible again

* fix CommandTree printing

* remove unnecessary generic type from GenericEvent

* fix unit tests

* unify functional interfaces

* refactor reply

* change Helpers class and fix unit tests

* formatting

* formatting

---------

Co-authored-by: Kaktushose <42280757+Kaktushose@users.noreply.github.com>
---
 .envrc                                        |   1 +
 .github/workflows/ci.yml                      |  10 +-
 flake.lock                                    |  58 ++++
 flake.nix                                     |  37 +++
 pom.xml                                       |   6 +-
 .../kaktushose/jda/commands/Helpers.java      |  91 ++++++
 .../kaktushose/jda/commands/JDACommands.java  | 246 ++++------------
 .../kaktushose/jda/commands/JDAContext.java   |  87 ++----
 .../jda/commands/SlashCommandUpdater.java     |  12 +-
 .../interactions/ContextCommand.java          |   7 -
 .../annotations/interactions/Interaction.java |   9 +-
 .../interactions/SlashCommand.java            |   7 -
 .../jda/commands/data/CommandTree.java        |  10 +-
 .../jda/commands/data/EmbedCache.java         |   5 +-
 .../jda/commands/data/TreeNode.java           |  13 +-
 .../dependency/DependencyInjector.java        |   2 +-
 .../dispatching/DispatcherSupervisor.java     |  30 +-
 .../dispatching/RuntimeSupervisor.java        |   2 +-
 .../dispatching/adapter/TypeAdapter.java      |  21 +-
 .../adapter/TypeAdapterRegistry.java          |  16 +-
 .../adapter/impl/AudioChannelAdapter.java     |  26 +-
 .../adapter/impl/BooleanAdapter.java          |   2 +-
 .../dispatching/adapter/impl/ByteAdapter.java |   2 +-
 .../adapter/impl/CharacterAdapter.java        |   2 +-
 .../adapter/impl/DoubleAdapter.java           |   2 +-
 .../adapter/impl/FloatAdapter.java            |   2 +-
 .../adapter/impl/GuildChannelAdapter.java     |  20 +-
 .../impl/GuildMessageChannelAdapter.java      |  26 +-
 .../adapter/impl/IntegerAdapter.java          |   2 +-
 .../dispatching/adapter/impl/LongAdapter.java |   2 +-
 .../adapter/impl/MemberAdapter.java           |   5 +-
 .../adapter/impl/NewsChannelAdapter.java      |  18 +-
 .../dispatching/adapter/impl/RoleAdapter.java |   5 +-
 .../adapter/impl/ShortAdapter.java            |   2 +-
 .../adapter/impl/StageChannelAdapter.java     |  18 +-
 .../adapter/impl/TextChannelAdapter.java      |  18 +-
 .../adapter/impl/ThreadChannelAdapter.java    |  18 +-
 .../dispatching/adapter/impl/UserAdapter.java |   5 +-
 .../adapter/impl/VoiceChannelAdapter.java     |  18 +-
 .../dispatching/interactions/Context.java     |  54 +---
 .../interactions/GenericDispatcher.java       |  51 ++--
 .../interactions/GenericEvent.java            |  75 ++---
 .../autocomplete/AutoCompleteDispatcher.java  |  20 +-
 .../autocomplete/AutoCompleteEvent.java       |   8 +-
 .../commands/CommandDispatcher.java           |  30 +-
 .../interactions/commands/CommandEvent.java   |   8 +-
 .../commands/SlashCommandContext.java         |  10 +-
 .../components/ComponentDispatcher.java       |  21 +-
 .../components/ComponentEvent.java            |   8 +-
 .../interactions/modals/ModalDispatcher.java  |  17 +-
 .../interactions/modals/ModalEvent.java       |   8 +-
 .../dispatching/middleware/Middleware.java    |   7 +-
 .../middleware/MiddlewareRegistry.java        |  13 +-
 .../middleware/impl/ConstraintMiddleware.java |   8 +-
 .../middleware/impl/CooldownMiddleware.java   |   4 +-
 .../impl/PermissionsMiddleware.java           |   2 +-
 .../dispatching/reply/ModalReplyable.java     |   2 +-
 .../commands/dispatching/reply/Replyable.java |  24 +-
 .../dispatching/reply/components/Buttons.java |  55 +---
 .../reply/components/Component.java           |   2 +-
 .../reply/components/SelectMenus.java         |  18 +-
 .../dispatching/validation/Validator.java     |   3 +-
 .../validation/impl/MaximumValidator.java     |   2 +-
 .../validation/impl/MinimumValidator.java     |   2 +-
 .../impl/NotPermissionValidator.java          |   2 +-
 .../validation/impl/NotRoleValidator.java     |   4 +-
 .../validation/impl/NotUserValidator.java     |   4 +-
 .../validation/impl/PermissionValidator.java  |   2 +-
 .../validation/impl/RoleValidator.java        |   4 +-
 .../validation/impl/UserValidator.java        |   4 +-
 .../embeds/DefaultErrorMessageFactory.java    |   6 +-
 .../embeds/JsonErrorMessageFactory.java       |  10 +-
 .../reflect/ConstraintDefinition.java         |  54 +---
 .../commands/reflect/CooldownDefinition.java  |  69 +----
 .../InteractionControllerDefinition.java      | 269 ++++++------------
 .../commands/reflect/InteractionRegistry.java | 114 +++-----
 .../commands/reflect/MethodBuildContext.java  |  22 ++
 .../commands/reflect/ParameterDefinition.java | 236 ++++-----------
 .../commands/reflect/TextInputDefinition.java | 101 +------
 .../interactions/AutoCompleteDefinition.java  |  48 +---
 .../EphemeralInteractionDefinition.java       |   5 +-
 .../GenericInteractionDefinition.java         |   2 +-
 .../reflect/interactions/ModalDefinition.java |  27 +-
 .../commands/ContextCommandDefinition.java    |  50 ++--
 .../commands/GenericCommandDefinition.java    |  26 +-
 .../commands/SlashCommandDefinition.java      | 133 ++++-----
 .../components/ButtonDefinition.java          |  66 ++---
 .../GenericComponentDefinition.java           |   3 +-
 .../menus/EntitySelectMenuDefinition.java     |  82 +++---
 .../menus/GenericSelectMenuDefinition.java    |   2 +-
 .../menus/SelectOptionDefinition.java         |  81 +-----
 .../menus/StringSelectMenuDefinition.java     |  74 ++---
 .../scope/DefaultGuildScopeProvider.java      |   3 +-
 .../commands/scope/GuildScopeProvider.java    |   6 +-
 src/main/java/module-info.java                |   9 +
 src/test/java/adapting/CustomTypeAdapter.java |   2 +-
 .../adapting/TypeAdapterRegistryTest.java     |  42 ++-
 src/test/java/adapting/TypeAdapterTest.java   | 147 +++++-----
 src/test/java/adapting/mock/GuildMock.java    |  10 +-
 .../java/adapting/mock/JDACommandsMock.java   |  28 +-
 .../CommandDefinitionTestController.java      |   5 -
 .../commands/SlashCommandDefinitionTest.java  |  76 ++---
 .../InteractionControllerDefinitionTest.java  |  41 ++-
 .../parameters/ParameterDefinitionTest.java   |  16 +-
 104 files changed, 1233 insertions(+), 1967 deletions(-)
 create mode 100644 .envrc
 create mode 100644 flake.lock
 create mode 100644 flake.nix
 create mode 100644 src/main/java/com/github/kaktushose/jda/commands/Helpers.java
 create mode 100644 src/main/java/com/github/kaktushose/jda/commands/reflect/MethodBuildContext.java
 create mode 100644 src/main/java/module-info.java

diff --git a/.envrc b/.envrc
new file mode 100644
index 000000000..8392d159f
--- /dev/null
+++ b/.envrc
@@ -0,0 +1 @@
+use flake
\ No newline at end of file
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b7b48e9a6..516aef305 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -2,7 +2,7 @@ name: Java CI
 
 on:
   push:
-    branches: [ main, development, release/* ]
+    branches: [ main, development, release/*, feature/*, bump-to-java-23 ]
   pull_request:
     branches: [ main, development, release/* ]
 
@@ -11,10 +11,10 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
         with:
-          java-version: 11
+          distribution: 'temurin'
+          java-version: '23'
       - name: Build with Maven
         run: mvn -B package --file pom.xml
diff --git a/flake.lock b/flake.lock
new file mode 100644
index 000000000..413c1f80b
--- /dev/null
+++ b/flake.lock
@@ -0,0 +1,58 @@
+{
+  "nodes": {
+    "flake-parts": {
+      "inputs": {
+        "nixpkgs-lib": "nixpkgs-lib"
+      },
+      "locked": {
+        "lastModified": 1730504689,
+        "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "506278e768c2a08bec68eb62932193e341f55c90",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1733064805,
+        "narHash": "sha256-7NbtSLfZO0q7MXPl5hzA0sbVJt6pWxxtGWbaVUDDmjs=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "31d66ae40417bb13765b0ad75dd200400e98de84",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs-lib": {
+      "locked": {
+        "lastModified": 1730504152,
+        "narHash": "sha256-lXvH/vOfb4aGYyvFmZK/HlsNsr/0CVWlwYvo2rxJk3s=",
+        "type": "tarball",
+        "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz"
+      }
+    },
+    "root": {
+      "inputs": {
+        "flake-parts": "flake-parts",
+        "nixpkgs": "nixpkgs"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}
diff --git a/flake.nix b/flake.nix
new file mode 100644
index 000000000..7ecec0e01
--- /dev/null
+++ b/flake.nix
@@ -0,0 +1,37 @@
+{
+  inputs = {
+    nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
+    flake-parts.url = "github:hercules-ci/flake-parts";
+  };
+
+  outputs = {
+    self,
+    flake-parts,
+    ...
+  } @ inputs:
+    flake-parts.lib.mkFlake {inherit inputs;} {
+      systems = ["x86_64-linux"];
+
+      perSystem = {
+        config,
+        lib,
+        pkgs,
+        system,
+        ...
+      }: let
+        javaVersion = 23;
+
+        jdk = pkgs."temurin-bin-${toString javaVersion}";
+        gradle = pkgs.gradle.override {
+            javaToolchains = [
+                jdk
+            ];
+        };
+       in {
+         devShells.default = pkgs.mkShell {
+           name = "Jack";
+           packages = with pkgs; [git jdk gradle maven];
+         };
+       };
+    };
+}
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index ac3c0ae15..891c26d86 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,8 +19,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.10.1</version>
                 <configuration>
-                    <source>11</source>
-                    <target>11</target>
+                    <source>23</source>
+                    <target>23</target>
                     <compilerArgs>
                         <arg>-parameters</arg>
                     </compilerArgs>
@@ -43,7 +43,7 @@
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.8.8</version>
+                <version>0.8.12</version>
                 <executions>
                     <execution>
                         <goals>
diff --git a/src/main/java/com/github/kaktushose/jda/commands/Helpers.java b/src/main/java/com/github/kaktushose/jda/commands/Helpers.java
new file mode 100644
index 000000000..e78e8649f
--- /dev/null
+++ b/src/main/java/com/github/kaktushose/jda/commands/Helpers.java
@@ -0,0 +1,91 @@
+package com.github.kaktushose.jda.commands;
+
+import com.github.kaktushose.jda.commands.annotations.interactions.Permissions;
+import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
+import com.github.kaktushose.jda.commands.reflect.MethodBuildContext;
+import net.dv8tion.jda.api.entities.Guild;
+import net.dv8tion.jda.api.entities.channel.middleman.GuildChannel;
+import org.jetbrains.annotations.NotNull;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.lang.reflect.Method;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Optional;
+import java.util.Set;
+
+public final class Helpers {
+
+    private static final Logger log = LoggerFactory.getLogger(Helpers.class);
+
+    /**
+     * Sanitizes a String containing a raw mention. This will remove all markdown characters namely <em>< @ # & ! ></em>
+     * For instance: {@code <@!393843637437464588>} gets sanitized to {@code 393843637437464588}
+     *
+     * @param mention the raw String to sanitize
+     * @return the sanitized String
+     */
+    public static String sanitizeMention(@NotNull String mention) {
+        if (mention.matches("<[@#][&!]?([0-9]{4,})>")) {
+            return mention.replaceAll("<[@#][&!]?", "").replace(">", "");
+        }
+        return mention;
+    }
+
+    public static Optional<GuildChannel> resolveGuildChannel(Context context, String raw) {
+        GuildChannel guildChannel;
+        raw = sanitizeMention(raw);
+
+        Guild guild = context.getEvent().getGuild();
+        if (raw.matches("\\d+")) {
+            guildChannel = guild.getGuildChannelById(raw);
+        } else {
+            String finalRaw = raw;
+            guildChannel = guild.getChannels().stream().filter(it -> it.getName().equalsIgnoreCase(finalRaw))
+                    .findFirst().orElse(null);
+        }
+        return Optional.ofNullable(guildChannel);
+    }
+
+    public static Set<String> permissions(MethodBuildContext context) {
+        Permissions permission = context.method().getAnnotation(Permissions.class);
+
+        if (permission != null) {
+            HashSet<String> mergedPermissions = new HashSet<>(context.permissions());
+            mergedPermissions.addAll(Set.of(permission.value()));
+            return Collections.unmodifiableSet(mergedPermissions);
+        }
+        return context.permissions();
+    }
+
+    public static boolean ephemeral(MethodBuildContext context, boolean localEphemeral) {
+        return context.interaction().ephemeral() || localEphemeral;
+    }
+
+    public static boolean isIncorrectParameterType(Method method, int index, Class<?> type) {
+        if (!type.isAssignableFrom(method.getParameters()[index].getType())) {
+            log.error("An error has occurred! Skipping Interaction {}.{}:",
+                    method.getDeclaringClass().getSimpleName(),
+                    method.getName(),
+                    new IllegalArgumentException(String.format("%d. parameter must be of type %s", index + 1, type.getSimpleName())));
+            return true;
+        }
+        return false;
+    }
+
+    public static boolean isIncorrectParameterAmount(Method method, int amount) {
+        if (method.getParameters().length != amount) {
+            log.error("An error has occurred! Skipping Interaction {}.{}:",
+                    method.getDeclaringClass().getSimpleName(),
+                    method.getName(),
+                    new IllegalArgumentException(String.format(
+                            "Invalid amount of parameters!. Expected: %d Actual: %d",
+                            amount,
+                            method.getParameters().length
+                    )));
+            return true;
+        }
+        return false;
+    }
+}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/JDACommands.java b/src/main/java/com/github/kaktushose/jda/commands/JDACommands.java
index e1165047e..33864f8e1 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/JDACommands.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/JDACommands.java
@@ -21,70 +21,57 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-/**
- * Represents an active instance of this framework and provides access to all underlying classes.
- *
- * @since 1.0.0
- */
-public class JDACommands {
 
+public record JDACommands(
+        JDAContext jdaContext,
+        DispatcherSupervisor dispatcherSupervisor,
+        MiddlewareRegistry middlewareRegistry,
+        TypeAdapterRegistry adapterRegistry,
+        ValidatorRegistry validatorRegistry,
+        DependencyInjector dependencyInjector,
+        InteractionRegistry interactionRegistry,
+        SlashCommandUpdater updater,
+        RuntimeSupervisor runtimeSupervisor
+) {
     private static final Logger log = LoggerFactory.getLogger(JDACommands.class);
-    private static boolean isActive;
-    private final JDAContext jdaContext;
-    private final ImplementationRegistry implementationRegistry;
-    private final DispatcherSupervisor dispatcherSupervisor;
-    private final MiddlewareRegistry middlewareRegistry;
-    private final TypeAdapterRegistry adapterRegistry;
-    private final ValidatorRegistry validatorRegistry;
-    private final DependencyInjector dependencyInjector;
-    private final InteractionRegistry interactionRegistry;
-    private final SlashCommandUpdater updater;
-    private final RuntimeSupervisor runtimeSupervisor;
-
-    // this is needed for unit testing
-    protected JDACommands() {
-        jdaContext = null;
-        implementationRegistry = null;
-        runtimeSupervisor = null;
-        middlewareRegistry = null;
-        adapterRegistry = null;
-        validatorRegistry = null;
-        dependencyInjector = null;
-        dispatcherSupervisor = null;
-        interactionRegistry = null;
-        updater = null;
-    }
 
-    private JDACommands(Object jda, Class<?> clazz, LocalizationFunction function, DependencyInjector injector, String... packages) {
+    private static JDACommands startInternal(Object jda, Class<?> clazz, LocalizationFunction function, DependencyInjector dependencyInjector, String... packages) {
         log.info("Starting JDA-Commands...");
 
-        if (isActive) {
-            throw new IllegalStateException("An instance of the command framework is already running!");
-        }
-
-        jdaContext = new JDAContext(jda);
-        dependencyInjector = injector;
+        var jdaContext = new JDAContext(jda);
         dependencyInjector.index(clazz, packages);
 
-        middlewareRegistry = new MiddlewareRegistry();
-        adapterRegistry = new TypeAdapterRegistry();
-        validatorRegistry = new ValidatorRegistry();
-        implementationRegistry = new ImplementationRegistry(dependencyInjector, middlewareRegistry, adapterRegistry, validatorRegistry);
-        interactionRegistry = new InteractionRegistry(validatorRegistry, dependencyInjector, function);
+        var middlewareRegistry = new MiddlewareRegistry();
+        var adapterRegistry = new TypeAdapterRegistry();
+        var validatorRegistry = new ValidatorRegistry();
+        var implementationRegistry = new ImplementationRegistry(dependencyInjector, middlewareRegistry, adapterRegistry, validatorRegistry);
+        var interactionRegistry = new InteractionRegistry(validatorRegistry, dependencyInjector, function);
 
-        runtimeSupervisor = new RuntimeSupervisor(dependencyInjector);
-        dispatcherSupervisor = new DispatcherSupervisor(this);
+        var runtimeSupervisor = new RuntimeSupervisor(dependencyInjector);
+        var dispatcherSupervisor = new DispatcherSupervisor(middlewareRegistry, implementationRegistry, interactionRegistry, adapterRegistry, runtimeSupervisor);
 
         implementationRegistry.index(clazz, packages);
 
         interactionRegistry.index(clazz, packages);
 
-        updater = new SlashCommandUpdater(this);
+        var updater = new SlashCommandUpdater(jdaContext, implementationRegistry.getGuildScopeProvider(), interactionRegistry);
         updater.updateAllCommands();
+
         jdaContext.performTask(it -> it.addEventListener(dispatcherSupervisor));
 
-        isActive = true;
         log.info("Finished loading!");
+
+        return new JDACommands(
+                jdaContext,
+                dispatcherSupervisor,
+                middlewareRegistry,
+                adapterRegistry,
+                validatorRegistry,
+                dependencyInjector,
+                interactionRegistry,
+                updater,
+                runtimeSupervisor
+        );
     }
 
     /**
@@ -96,7 +83,7 @@ private JDACommands(Object jda, Class<?> clazz, LocalizationFunction function, D
      * @return a new JDACommands instance
      */
     public static JDACommands start(@NotNull JDA jda, @NotNull Class<?> clazz, @NotNull String... packages) {
-        return new JDACommands(jda, clazz, ResourceBundleLocalizationFunction.empty().build(), new DefaultDependencyInjector(), packages);
+        return startInternal(jda, clazz, ResourceBundleLocalizationFunction.empty().build(), new DefaultDependencyInjector(), packages);
     }
 
     /**
@@ -108,7 +95,7 @@ public static JDACommands start(@NotNull JDA jda, @NotNull Class<?> clazz, @NotN
      * @return a new JDACommands instance
      */
     public static JDACommands start(@NotNull ShardManager shardManager, @NotNull Class<?> clazz, @NotNull String... packages) {
-        return new JDACommands(shardManager, clazz, ResourceBundleLocalizationFunction.empty().build(), new DefaultDependencyInjector(), packages);
+        return startInternal(shardManager, clazz, ResourceBundleLocalizationFunction.empty().build(), new DefaultDependencyInjector(), packages);
     }
 
     /**
@@ -121,7 +108,7 @@ public static JDACommands start(@NotNull ShardManager shardManager, @NotNull Cla
      * @return a new JDACommands instance
      */
     public static JDACommands start(@NotNull JDA jda, @NotNull Class<?> clazz, LocalizationFunction function, @NotNull String... packages) {
-        return new JDACommands(jda, clazz, function, new DefaultDependencyInjector(), packages);
+        return startInternal(jda, clazz, function, new DefaultDependencyInjector(), packages);
     }
 
     /**
@@ -134,7 +121,7 @@ public static JDACommands start(@NotNull JDA jda, @NotNull Class<?> clazz, Local
      * @return a new JDACommands instance
      */
     public static JDACommands start(@NotNull ShardManager shardManager, @NotNull Class<?> clazz, LocalizationFunction function, @NotNull String... packages) {
-        return new JDACommands(shardManager, clazz, function, new DefaultDependencyInjector(), packages);
+        return startInternal(shardManager, clazz, function, new DefaultDependencyInjector(), packages);
     }
 
     /**
@@ -148,7 +135,7 @@ public static JDACommands start(@NotNull ShardManager shardManager, @NotNull Cla
      * @return a new JDACommands instance
      */
     public static JDACommands start(@NotNull JDA jda, @NotNull Class<?> clazz, LocalizationFunction function, DependencyInjector injector, @NotNull String... packages) {
-        return new JDACommands(jda, clazz, function, injector, packages);
+        return startInternal(jda, clazz, function, injector, packages);
     }
 
     /**
@@ -162,16 +149,7 @@ public static JDACommands start(@NotNull JDA jda, @NotNull Class<?> clazz, Local
      * @return a new JDACommands instance
      */
     public static JDACommands start(@NotNull ShardManager shardManager, @NotNull Class<?> clazz, LocalizationFunction function, DependencyInjector injector, @NotNull String... packages) {
-        return new JDACommands(shardManager, clazz, function, injector, packages);
-    }
-
-    /**
-     * Whether this JDACommands instance is active.
-     *
-     * @return {@code true} if the JDACommands instance is active
-     */
-    public static boolean isActive() {
-        return isActive;
+        return startInternal(shardManager, clazz, function, injector, packages);
     }
 
     /**
@@ -180,28 +158,15 @@ public static boolean isActive() {
      */
     public void shutdown() {
         jdaContext.performTask(jda -> jda.removeEventListener(dispatcherSupervisor));
-        isActive = false;
-    }
-
-    /**
-     * Gets the {@link DispatcherSupervisor}.
-     *
-     * @return the {@link DispatcherSupervisor}
-     */
-    public DispatcherSupervisor getDispatcherSupervisor() {
-        return dispatcherSupervisor;
     }
 
     /**
      * Updates all slash commands that are registered with
      * {@link com.github.kaktushose.jda.commands.annotations.interactions.SlashCommand.CommandScope#GUILD
      * CommandScope#Guild}
-     *
-     * @return this instance
      */
-    public JDACommands updateGuildCommands() {
+    public void updateGuildCommands() {
         updater.updateGuildCommands();
-        return this;
     }
 
     /**
@@ -272,7 +237,8 @@ public Button getButton(String button, String runtimeId) {
      * @param selectMenu the id of the selectMenu
      * @return a JDA {@link SelectMenu}
      */
-    public SelectMenu getSelectMenu(String selectMenu) {
+    @SuppressWarnings("unchecked")
+    public <T extends SelectMenu> T getSelectMenu(String selectMenu) {
         if (!selectMenu.matches("[a-zA-Z]+\\.[a-zA-Z]+")) {
             throw new IllegalArgumentException("Unknown Select Menu");
         }
@@ -283,43 +249,28 @@ public SelectMenu getSelectMenu(String selectMenu) {
                 .findFirst().orElseThrow(() -> new IllegalArgumentException("Unknown Select Menu"));
 
         RuntimeSupervisor.InteractionRuntime runtime = runtimeSupervisor.newRuntime(selectMenuDefinition);
-        return selectMenuDefinition.toSelectMenu(runtime.getRuntimeId(), true);
+        return (T) selectMenuDefinition.toSelectMenu(runtime.getRuntimeId(), true);
     }
 
     /**
-     * Gets a JDA {@link SelectMenu} to use it for message builders based on the jda-commands id.
-     *
-     * <p>
-     * The id is made up of the simple class name and the method name. E.g. the id of a a select menu defined by a
-     * {@code onSelectMenu(ComponentEvent event)} method inside an {@code ExampleMenu} class would be
-     * {@code ExampleMenu.onSelectMenu}.
-     * </p>
-     *
-     * @param selectMenu the id of the selectMenu
-     * @param clazz      the subtype of {@link SelectMenu}
-     * @return a JDA {@link SelectMenu}
-     */
-    public <T extends SelectMenu> T getSelectMenu(String selectMenu, Class<T> clazz) {
-        return (T) getSelectMenu(selectMenu);
-    }
-
-    /**
-     * Gets a JDA {@link SelectMenu} to use it for message builders based on the jda-commands id and links it an
+     * Gets a JDA {@link SelectMenu} subtype to use it for message builders based on the jda-commands id and links it an
      * existing
      * {@link com.github.kaktushose.jda.commands.dispatching.RuntimeSupervisor.InteractionRuntime InteractionRuntime}.
      *
      * <p>
-     * The id is made up of the simple class name and the method name. E.g. the id of a a select menu defined by a
+     * The id is made up of the simple class name and the method name. E.g. the id of a select menu defined by a
      * {@code onSelectMenu(ComponentEvent event)} method inside an {@code ExampleMenu} class would be
      * {@code ExampleMenu.onSelectMenu}.
      * </p>
      *
      * @param selectMenu the id of the selectMenu
      * @param runtimeId  the id of the
-     *                   {@link com.github.kaktushose.jda.commands.dispatching.RuntimeSupervisor.InteractionRuntime InteractionRuntime}
+     *                   {@link com.github.kaktushose.jda.commands.dispatching.RuntimeSupervisor.InteractionRuntime
+     *                   InteractionRuntime}
      * @return a JDA {@link SelectMenu}
      */
-    public SelectMenu getSelectMenu(String selectMenu, String runtimeId) {
+    @SuppressWarnings("unchecked")
+    public <T extends SelectMenu> T getSelectMenu(String selectMenu, String runtimeId) {
         if (!selectMenu.matches("[a-zA-Z]+\\.[a-zA-Z]+")) {
             throw new IllegalArgumentException("Unknown Select Menu");
         }
@@ -329,101 +280,6 @@ public SelectMenu getSelectMenu(String selectMenu, String runtimeId) {
                 .filter(it -> it.getDefinitionId().equals(sanitizedId))
                 .findFirst().orElseThrow(() -> new IllegalArgumentException("Unknown Select Menu"));
 
-        return selectMenuDefinition.toSelectMenu(runtimeId, true);
-    }
-
-    /**
-     * Gets a JDA {@link SelectMenu} subtype to use it for message builders based on the jda-commands id and links it an
-     * existing
-     * {@link com.github.kaktushose.jda.commands.dispatching.RuntimeSupervisor.InteractionRuntime InteractionRuntime}.
-     *
-     * <p>
-     * The id is made up of the simple class name and the method name. E.g. the id of a a select menu defined by a
-     * {@code onSelectMenu(ComponentEvent event)} method inside an {@code ExampleMenu} class would be
-     * {@code ExampleMenu.onSelectMenu}.
-     * </p>
-     *
-     * @param selectMenu the id of the selectMenu
-     * @param runtimeId  the id of the
-     *                   {@link com.github.kaktushose.jda.commands.dispatching.RuntimeSupervisor.InteractionRuntime
-     *                   InteractionRuntime}
-     * @param clazz      the subtype of {@link SelectMenu}
-     * @return a JDA {@link SelectMenu}
-     */
-    public <T extends SelectMenu> T getSelectMenu(String selectMenu, String runtimeId, Class<T> clazz) {
-        return (T) getSelectMenu(selectMenu, runtimeId);
-    }
-
-    /**
-     * Gets the {@link ImplementationRegistry}.
-     *
-     * @return the {@link ImplementationRegistry}
-     */
-    public ImplementationRegistry getImplementationRegistry() {
-        return implementationRegistry;
-    }
-
-
-    /**
-     * Gets the {@link RuntimeSupervisor}
-     *
-     * @return the {@link RuntimeSupervisor}
-     */
-    public RuntimeSupervisor getRuntimeSupervisor() {
-        return runtimeSupervisor;
-    }
-
-    /**
-     * Gets the {@link TypeAdapterRegistry}.
-     *
-     * @return the {@link TypeAdapterRegistry}
-     */
-    public TypeAdapterRegistry getAdapterRegistry() {
-        return adapterRegistry;
-    }
-
-    /**
-     * Gets the {@link ValidatorRegistry}.
-     *
-     * @return the {@link ValidatorRegistry}
-     */
-    public ValidatorRegistry getValidatorRegistry() {
-        return validatorRegistry;
-    }
-
-    /**
-     * Gets the {@link InteractionRegistry}.
-     *
-     * @return the {@link InteractionRegistry}
-     */
-    public InteractionRegistry getInteractionRegistry() {
-        return interactionRegistry;
-    }
-
-    /**
-     * Gets the {@link JDAContext}.
-     *
-     * @return the JDAContext.
-     */
-    public JDAContext getJDAContext() {
-        return jdaContext;
-    }
-
-    /**
-     * Gets the {@link MiddlewareRegistry}.
-     *
-     * @return the {@link MiddlewareRegistry}
-     */
-    public MiddlewareRegistry getMiddlewareRegistry() {
-        return middlewareRegistry;
-    }
-
-    /**
-     * Gets the {@link DependencyInjector}.
-     *
-     * @return the {@link DependencyInjector}
-     */
-    public DependencyInjector getDependencyInjector() {
-        return dependencyInjector;
+        return (T) selectMenuDefinition.toSelectMenu(runtimeId, true);
     }
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/JDAContext.java b/src/main/java/com/github/kaktushose/jda/commands/JDAContext.java
index e1a8aa0a8..612ccf373 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/JDAContext.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/JDAContext.java
@@ -4,6 +4,7 @@
 import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.sharding.ShardManager;
 import net.dv8tion.jda.api.utils.cache.SnowflakeCacheView;
+import org.jetbrains.annotations.ApiStatus;
 
 import java.util.List;
 import java.util.function.Consumer;
@@ -14,17 +15,18 @@
  *
  * @since 2.3.0
  */
-public class JDAContext {
+@ApiStatus.Internal
+public final class JDAContext {
 
-    private final Object jda;
+    private final Object context;
 
     /**
      * Constructs a new JDAContext.
      *
-     * @param jda the {@link JDA} or {@link ShardManager} object
+     * @param context the {@link JDA} or {@link ShardManager} object
      */
-    public JDAContext(Object jda) {
-        this.jda = jda;
+    public JDAContext(Object context) {
+        this.context = context;
     }
 
     /**
@@ -33,35 +35,14 @@ public JDAContext(Object jda) {
      * @param consumer the operation to perform
      */
     public void performTask(Consumer<JDA> consumer) {
-        if (jda instanceof ShardManager) {
-            ((ShardManager) jda).getShardCache().forEach(consumer);
-        } else if (jda instanceof JDA) {
-            consumer.accept((JDA) jda);
-        } else {
-            throw new IllegalArgumentException(String.format("Cannot cast %s", jda.getClass().getSimpleName()));
+        switch (context) {
+            case ShardManager shardManager -> shardManager.getShardCache().forEach(consumer);
+            case JDA jda -> consumer.accept(jda);
+            default ->
+                    throw new IllegalArgumentException(String.format("Cannot cast %s", context.getClass().getSimpleName()));
         }
     }
 
-    /**
-     * Gets the JDA instance as an Object. This can either be {@link JDA} or a {@link ShardManager}.
-     * Use {@link #isShardManager()} to distinguish.
-     *
-     * @return the JDA instance.
-     */
-    public Object getJDAObject() {
-        return jda;
-    }
-
-    /**
-     * Whether the JDA instance is a {@link ShardManager}.
-     *
-     * @return {@code true} if the JDA instance is a {@link ShardManager}
-     * @deprecated
-     */
-    public boolean isShardManager() {
-        return jda instanceof ShardManager;
-    }
-
     /**
      * An unmodifiable List of all {@link Guild Guilds} that the logged account is connected to.
      * If this account is not connected to any {@link Guild Guilds}, this will return an empty list.
@@ -72,13 +53,12 @@ public boolean isShardManager() {
      * @return Possibly-empty list of all the {@link Guild Guilds} that this account is connected to.
      */
     public List<Guild> getGuilds() {
-        if (jda instanceof ShardManager) {
-            return ((ShardManager) jda).getGuilds();
-        } else if (jda instanceof JDA) {
-            return ((JDA) jda).getGuilds();
-        } else {
-            throw new IllegalArgumentException(String.format("Cannot cast %s", jda.getClass().getSimpleName()));
-        }
+        return switch (context) {
+            case ShardManager shardManager -> shardManager.getGuilds();
+            case JDA jda -> jda.getGuilds();
+            default ->
+                    throw new IllegalArgumentException(String.format("Cannot cast %s", context.getClass().getSimpleName()));
+        };
     }
 
     /**
@@ -87,30 +67,11 @@ public List<Guild> getGuilds() {
      * @return {@link SnowflakeCacheView}
      */
     public SnowflakeCacheView<Guild> getGuildCache() {
-        if (jda instanceof ShardManager) {
-            return ((ShardManager) jda).getGuildCache();
-        } else if (jda instanceof JDA) {
-            return ((JDA) jda).getGuildCache();
-        } else {
-            throw new IllegalArgumentException(String.format("Cannot cast %s", jda.getClass().getSimpleName()));
-        }
-    }
-
-    /**
-     * Gets the JDA instance as {@link JDA}.
-     *
-     * @return the JDA instance as {@link JDA}
-     */
-    public JDA getAsJDA() {
-        return (JDA) jda;
-    }
-
-    /**
-     * Gets the JDA instance as {@link ShardManager}.
-     *
-     * @return the JDA instance as {@link ShardManager}
-     */
-    public ShardManager getAsShardManager() {
-        return (ShardManager) jda;
+        return switch (context) {
+            case ShardManager shardManager -> shardManager.getGuildCache();
+            case JDA jda -> jda.getGuildCache();
+            default ->
+                    throw new IllegalArgumentException(String.format("Cannot cast %s", context.getClass().getSimpleName()));
+        };
     }
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/SlashCommandUpdater.java b/src/main/java/com/github/kaktushose/jda/commands/SlashCommandUpdater.java
index ccbe5ea52..b3be2c4b2 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/SlashCommandUpdater.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/SlashCommandUpdater.java
@@ -32,13 +32,11 @@ public class SlashCommandUpdater {
 
     /**
      * Constructs a new SlashCommandUpdater.
-     *
-     * @param jdaCommands the corresponding {@link JDACommands} instance
      */
-    public SlashCommandUpdater(JDACommands jdaCommands) {
-        this.jdaContext = jdaCommands.getJDAContext();
-        guildScopeProvider = jdaCommands.getImplementationRegistry().getGuildScopeProvider();
-        interactionRegistry = jdaCommands.getInteractionRegistry();
+    public SlashCommandUpdater(JDAContext jdaContext, GuildScopeProvider guildScopeProvider, InteractionRegistry interactionRegistry) {
+        this.jdaContext = jdaContext;
+        this.guildScopeProvider = guildScopeProvider;
+        this.interactionRegistry = interactionRegistry;
     }
 
     /**
@@ -120,7 +118,7 @@ private Map<Long, Set<CommandData>> getGuildMapping() {
         Map<Long, Set<CommandData>> guildMapping = new HashMap<>();
         for (CommandData command : result) {
             // create a copy so that a user doesn't modify the command data used for registration
-            Set<Long> guildIds = guildScopeProvider.getGuildsForCommand(CommandData.fromData(command.toData()));
+            Set<Long> guildIds = guildScopeProvider.apply(CommandData.fromData(command.toData()));
             if (guildIds.isEmpty()) {
                 log.debug("No guilds provided for command \"{}\"", command.getName());
             } else {
diff --git a/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/ContextCommand.java b/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/ContextCommand.java
index f99449093..5dbf518d9 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/ContextCommand.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/ContextCommand.java
@@ -41,13 +41,6 @@
      */
     boolean isGuildOnly() default false;
 
-    /**
-     * Returns whether this command is active and thus can be executed or not.
-     *
-     * @return {@code true} if this command is active
-     */
-    boolean isActive() default true;
-
     /**
      * Returns whether this command can only be executed in NSFW channels.
      *
diff --git a/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Interaction.java b/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Interaction.java
index a732ce9a9..608b708b7 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Interaction.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Interaction.java
@@ -7,7 +7,7 @@
 
 /**
  * Classes annotated with Interaction will be scanned at startup and are eligible for defining interactions such as
- * slash commands, buttons, modals or context menus.
+ * slash commands, buttonContainers, modals or context menus.
  *
  * @since 4.0.0
  */
@@ -22,13 +22,6 @@
      */
     String value() default "";
 
-    /**
-     * Returns whether this interaction is active and thus can be executed or not
-     *
-     * @return {@code true} if this interaction is active
-     */
-    boolean isActive() default true;
-
     /**
      * Returns whether this interaction should send ephemeral replies by default.
      *
diff --git a/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/SlashCommand.java b/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/SlashCommand.java
index f82920fb1..8a5792b05 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/SlashCommand.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/SlashCommand.java
@@ -52,13 +52,6 @@
      */
     String desc() default "N/A";
 
-    /**
-     * Returns whether this command is active and thus can be executed or not.
-     *
-     * @return {@code true} if this command is active
-     */
-    boolean isActive() default true;
-
     /**
      * Returns whether this command can only be executed in NSFW channels.
      *
diff --git a/src/main/java/com/github/kaktushose/jda/commands/data/CommandTree.java b/src/main/java/com/github/kaktushose/jda/commands/data/CommandTree.java
index d97eaebec..e82ed4a24 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/data/CommandTree.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/data/CommandTree.java
@@ -14,22 +14,22 @@
  * @see <a href="https://discord.com/developers/docs/interactions/application-commands#subcommands-and-subcommand-groups">Discord Subcommands and Subcommand Groups Documentation</a>
  * @since 2.3.0
  */
-public class CommandTree {
-
-    private final TreeNode root;
+public record CommandTree(
+        TreeNode root
+) {
 
     /**
      * Constructs an empty CommandTree.
      */
     public CommandTree() {
-        root = new TreeNode();
+        this(new TreeNode());
     }
 
     /**
      * Constructs a new CommandTree.
      */
     public CommandTree(Collection<SlashCommandDefinition> commands) {
-        root = new TreeNode();
+        this(new TreeNode());
         addAll(commands);
     }
 
diff --git a/src/main/java/com/github/kaktushose/jda/commands/data/EmbedCache.java b/src/main/java/com/github/kaktushose/jda/commands/data/EmbedCache.java
index b833daf7f..34c769c34 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/data/EmbedCache.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/data/EmbedCache.java
@@ -27,7 +27,7 @@ public class EmbedCache {
     private static final Gson gson = new Gson();
     private final File file;
     private final InputStream stream;
-    private Map<String, EmbedDTO> embedMap;
+    private final Map<String, EmbedDTO> embedMap;
 
     /**
      * Constructs a new EmbedCache object.
@@ -93,7 +93,8 @@ public void loadEmbeds() {
             JsonReader jsonReader = new JsonReader(reader);
             Type type = new TypeToken<Map<String, EmbedDTO>>() {
             }.getType();
-            embedMap = gson.fromJson(jsonReader, type);
+            embedMap.clear();
+            embedMap.putAll(gson.fromJson(jsonReader, type));
         } catch (FileNotFoundException | JsonIOException | JsonSyntaxException e) {
             log.error("An error has occurred while loading the file!", e);
         }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/data/TreeNode.java b/src/main/java/com/github/kaktushose/jda/commands/data/TreeNode.java
index b37acc9f0..7fa68c38b 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/data/TreeNode.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/data/TreeNode.java
@@ -21,12 +21,13 @@
  * @see CommandTree
  * @since 2.3.0
  */
-public class TreeNode implements Iterable<TreeNode> {
+public record TreeNode(
+        String name,
+        SlashCommandDefinition command,
+        List<TreeNode> children
+) implements Iterable<TreeNode> {
 
     private static final Logger log = LoggerFactory.getLogger(SlashCommandUpdater.class);
-    private final String name;
-    private final SlashCommandDefinition command;
-    private final List<TreeNode> children;
 
     /**
      * Constructs an empty TreeNode. Should only be used for root nodes.
@@ -42,9 +43,7 @@ public TreeNode() {
      * @param command the {@link SlashCommandDefinition}
      */
     public TreeNode(@NotNull String name, @Nullable SlashCommandDefinition command) {
-        this.name = name;
-        this.command = command;
-        children = new ArrayList<>();
+        this(name, command, new ArrayList<>());
     }
 
     /**
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dependency/DependencyInjector.java b/src/main/java/com/github/kaktushose/jda/commands/dependency/DependencyInjector.java
index 57d5b7e1c..937db317e 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dependency/DependencyInjector.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dependency/DependencyInjector.java
@@ -47,5 +47,5 @@ public interface DependencyInjector {
      * Injects all registered dependencies with the corresponding value. If no value is present {@code null} gets injected.
      */
     void inject(Object instance);
-
 }
+
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/DispatcherSupervisor.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/DispatcherSupervisor.java
index 34dcd9b90..1eba503bc 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/DispatcherSupervisor.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/DispatcherSupervisor.java
@@ -1,6 +1,6 @@
 package com.github.kaktushose.jda.commands.dispatching;
 
-import com.github.kaktushose.jda.commands.JDACommands;
+import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapterRegistry;
 import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
 import com.github.kaktushose.jda.commands.dispatching.interactions.GenericDispatcher;
 import com.github.kaktushose.jda.commands.dispatching.interactions.autocomplete.AutoCompleteDispatcher;
@@ -8,6 +8,9 @@
 import com.github.kaktushose.jda.commands.dispatching.interactions.commands.SlashCommandContext;
 import com.github.kaktushose.jda.commands.dispatching.interactions.components.ComponentDispatcher;
 import com.github.kaktushose.jda.commands.dispatching.interactions.modals.ModalDispatcher;
+import com.github.kaktushose.jda.commands.dispatching.middleware.MiddlewareRegistry;
+import com.github.kaktushose.jda.commands.reflect.ImplementationRegistry;
+import com.github.kaktushose.jda.commands.reflect.InteractionRegistry;
 import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent;
 import net.dv8tion.jda.api.events.interaction.ModalInteractionEvent;
 import net.dv8tion.jda.api.events.interaction.command.CommandAutoCompleteInteractionEvent;
@@ -33,18 +36,20 @@ public class DispatcherSupervisor extends ListenerAdapter {
 
     private static final Logger log = LoggerFactory.getLogger(DispatcherSupervisor.class);
     private final Map<Class<? extends GenericInteractionCreateEvent>, GenericDispatcher> dispatchers;
-    private final JDACommands jdaCommands;
+    private final InteractionRegistry interactionRegistry;
+    private final ImplementationRegistry implementationRegistry;
 
     /**
      * Constructs a new DispatcherSupervisor.
      */
-    public DispatcherSupervisor(JDACommands jdaCommands) {
-        this.jdaCommands = jdaCommands;
+    public DispatcherSupervisor(MiddlewareRegistry middlewareRegistry, ImplementationRegistry implementationRegistry, InteractionRegistry interactionRegistry, TypeAdapterRegistry adapterRegistry, RuntimeSupervisor runtimeSupervisor) {
         dispatchers = new HashMap<>();
-        register(GenericCommandInteractionEvent.class, new CommandDispatcher(jdaCommands));
-        register(CommandAutoCompleteInteractionEvent.class, new AutoCompleteDispatcher(jdaCommands));
-        register(GenericComponentInteractionCreateEvent.class, new ComponentDispatcher(jdaCommands));
-        register(ModalInteractionEvent.class, new ModalDispatcher(jdaCommands));
+        register(GenericCommandInteractionEvent.class, new CommandDispatcher(middlewareRegistry, implementationRegistry, interactionRegistry, adapterRegistry, runtimeSupervisor));
+        register(CommandAutoCompleteInteractionEvent.class, new AutoCompleteDispatcher(middlewareRegistry, implementationRegistry, interactionRegistry, adapterRegistry, runtimeSupervisor));
+        register(GenericComponentInteractionCreateEvent.class, new ComponentDispatcher(middlewareRegistry, implementationRegistry, interactionRegistry, adapterRegistry, runtimeSupervisor));
+        register(ModalInteractionEvent.class, new ModalDispatcher(middlewareRegistry, implementationRegistry, interactionRegistry, adapterRegistry, runtimeSupervisor));
+        this.interactionRegistry = interactionRegistry;
+        this.implementationRegistry = implementationRegistry;
     }
 
     /**
@@ -79,12 +84,9 @@ public void onGenericInteractionCreate(@NotNull GenericInteractionCreateEvent ev
             return;
         }
 
-        Context context;
-        if (SlashCommandInteractionEvent.class.isAssignableFrom(clazz)) {
-            context = new SlashCommandContext((SlashCommandInteractionEvent) event, jdaCommands);
-        } else {
-            context = new Context(event, jdaCommands);
-        }
+        Context context = SlashCommandInteractionEvent.class.isAssignableFrom(clazz)
+                ? new SlashCommandContext((SlashCommandInteractionEvent) event, interactionRegistry, implementationRegistry)
+                : new Context(event, interactionRegistry, implementationRegistry);
 
         GenericDispatcher dispatcher = dispatchers.get(key.get());
         log.debug("Calling {}", dispatcher.getClass().getName());
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/RuntimeSupervisor.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/RuntimeSupervisor.java
index b33539874..1de864ce0 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/RuntimeSupervisor.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/RuntimeSupervisor.java
@@ -174,7 +174,7 @@ private Optional<InteractionRuntime> getRuntime(String interactionId) {
 
     /**
      * A runtime used for executing interactions. This class holds the instance of the class annotated with
-     * {@link Interaction Interaction} where commands, buttons, etc. live in. This runtime can only be used once per
+     * {@link Interaction Interaction} where commands, buttonContainers, etc. live in. This runtime can only be used once per
      * command execution.
      *
      * @since 4.0.0
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/TypeAdapter.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/TypeAdapter.java
index 09db79b82..bb6ece764 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/TypeAdapter.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/TypeAdapter.java
@@ -4,15 +4,17 @@
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Optional;
+import java.util.function.BiFunction;
 
 /**
  * Generic top level interface for type adapting.
  *
- * @see com.github.kaktushose.jda.commands.annotations.Implementation
  * @param <T> the type the adapter parses
+ * @see com.github.kaktushose.jda.commands.annotations.Implementation
  * @since 2.0.0
  */
-public interface TypeAdapter<T> {
+@FunctionalInterface
+public interface TypeAdapter<T> extends BiFunction<String, Context, Optional<T>> {
 
     /**
      * Attempts to parse a String to the given type.
@@ -21,19 +23,6 @@ public interface TypeAdapter<T> {
      * @param context the {@link Context}
      * @return the parsed type or an empty Optional if the parsing fails
      */
-    Optional<T> parse(@NotNull String raw, @NotNull Context context);
+    Optional<T> apply(@NotNull String raw, @NotNull Context context);
 
-    /**
-     * Sanitizes a String containing a raw mention. This will remove all markdown characters namely <em>< @ # & ! ></em>
-     * For instance: {@code <@!393843637437464588>} gets sanitized to {@code 393843637437464588}
-     *
-     * @param mention the raw String to sanitize
-     * @return the sanitized String
-     */
-    default String sanitizeMention(@NotNull String mention) {
-        if (mention.matches("<[@#][&!]?([0-9]{4,})>")) {
-            return mention.replaceAll("<[@#][&!]?", "").replace(">", "");
-        }
-        return mention;
-    }
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/TypeAdapterRegistry.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/TypeAdapterRegistry.java
index db0ddddd0..78c7b0c29 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/TypeAdapterRegistry.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/TypeAdapterRegistry.java
@@ -1,7 +1,6 @@
 package com.github.kaktushose.jda.commands.dispatching.adapter;
 
 import com.github.kaktushose.jda.commands.dispatching.adapter.impl.*;
-import com.github.kaktushose.jda.commands.dispatching.interactions.commands.CommandEvent;
 import com.github.kaktushose.jda.commands.dispatching.interactions.commands.SlashCommandContext;
 import com.github.kaktushose.jda.commands.embeds.ErrorMessageFactory;
 import com.github.kaktushose.jda.commands.reflect.ParameterDefinition;
@@ -138,12 +137,11 @@ public void adapt(@NotNull SlashCommandContext context) {
         ErrorMessageFactory messageFactory = context.getImplementationRegistry().getErrorMessageFactory();
 
         log.debug("Type adapting arguments...");
-        arguments.add(new CommandEvent(context));
         for (int i = 0; i < command.getActualParameters().size(); i++) {
             ParameterDefinition parameter = command.getActualParameters().get(i);
 
             // if parameter is array don't parse
-            if (String[].class.isAssignableFrom(parameter.getType())) {
+            if (String[].class.isAssignableFrom(parameter.type())) {
                 log.debug("First parameter is String array. Not adapting arguments");
                 arguments.add(input);
                 break;
@@ -162,24 +160,24 @@ public void adapt(@NotNull SlashCommandContext context) {
 
                 // if the default value is an empty String (thus not present) add a null value to the argument list
                 // else try to type adapt the default value
-                if (parameter.getDefaultValue() == null) {
-                    arguments.add(DEFAULT_MAPPINGS.getOrDefault(parameter.getType(), null));
+                if (parameter.defaultValue() == null) {
+                    arguments.add(DEFAULT_MAPPINGS.getOrDefault(parameter.type(), null));
                     continue;
                 } else {
-                    raw = parameter.getDefaultValue();
+                    raw = parameter.defaultValue();
                 }
             } else {
                 raw = input[i];
             }
 
-            log.debug("Trying to adapt input \"{}\" to type {}", raw, parameter.getType().getName());
+            log.debug("Trying to adapt input \"{}\" to type {}", raw, parameter.type().getName());
 
-            Optional<TypeAdapter<?>> adapter = get(parameter.getType());
+            Optional<TypeAdapter<?>> adapter = get(parameter.type());
             if (adapter.isEmpty()) {
                 throw new IllegalArgumentException("No type adapter found!");
             }
 
-            Optional<?> parsed = adapter.get().parse(raw, context);
+            Optional<?> parsed = adapter.get().apply(raw, context);
             if (parsed.isEmpty()) {
                 log.debug("Type adapting failed!");
                 context.setCancelled(messageFactory.getTypeAdaptingFailedMessage(context));
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/AudioChannelAdapter.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/AudioChannelAdapter.java
index 126ae0630..761277506 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/AudioChannelAdapter.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/AudioChannelAdapter.java
@@ -1,11 +1,10 @@
 package com.github.kaktushose.jda.commands.dispatching.adapter.impl;
 
+import com.github.kaktushose.jda.commands.Helpers;
 import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapter;
 import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
-import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.channel.Channel;
 import net.dv8tion.jda.api.entities.channel.middleman.AudioChannel;
-import net.dv8tion.jda.api.entities.channel.middleman.GuildChannel;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Optional;
@@ -25,29 +24,14 @@ public class AudioChannelAdapter implements TypeAdapter<AudioChannel> {
      * @return the parsed {@link AudioChannel} or an empty Optional if the parsing fails
      */
     @Override
-    public Optional<AudioChannel> parse(@NotNull String raw, @NotNull Context context) {
+    public Optional<AudioChannel> apply(@NotNull String raw, @NotNull Context context) {
         Channel channel = context.getEvent().getChannel();
         if (channel == null) {
             return Optional.empty();
         }
 
-        GuildChannel guildChannel;
-        raw = sanitizeMention(raw);
-
-        Guild guild = context.getEvent().getGuild();
-        if (raw.matches("\\d+")) {
-            guildChannel = guild.getGuildChannelById(raw);
-        } else {
-            String finalRaw = raw;
-            guildChannel = guild.getChannels().stream().filter(it -> it.getName().equalsIgnoreCase(finalRaw))
-                    .findFirst().orElse(null);
-        }
-        if (guildChannel == null) {
-            return Optional.empty();
-        }
-        if (!guildChannel.getType().isAudio()) {
-            return Optional.empty();
-        }
-        return Optional.of((AudioChannel) guildChannel);
+        return Helpers.resolveGuildChannel(context, raw)
+                .filter(it -> it.getType().isAudio())
+                .map(AudioChannel.class::cast);
     }
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/BooleanAdapter.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/BooleanAdapter.java
index a9a24ac15..f34be3cd1 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/BooleanAdapter.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/BooleanAdapter.java
@@ -22,7 +22,7 @@ public class BooleanAdapter implements TypeAdapter<Boolean> {
      * @return the parsed boolean or an empty Optional if the parsing fails
      */
     @Override
-    public Optional<Boolean> parse(@NotNull String raw, @NotNull Context context) {
+    public Optional<Boolean> apply(@NotNull String raw, @NotNull Context context) {
         if ("true".equalsIgnoreCase(raw) || "1".equals(raw)) {
             return Optional.of(true);
         }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/ByteAdapter.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/ByteAdapter.java
index 303c726af..6cff244ad 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/ByteAdapter.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/ByteAdapter.java
@@ -21,7 +21,7 @@ public class ByteAdapter implements TypeAdapter<Byte> {
      * @return the parsed Byte or an empty Optional if the parsing fails
      */
     @Override
-    public Optional<Byte> parse(@NotNull String raw, @NotNull Context context) {
+    public Optional<Byte> apply(@NotNull String raw, @NotNull Context context) {
         try {
             return Optional.of(Byte.valueOf(raw));
         } catch (NumberFormatException ignored) {
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/CharacterAdapter.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/CharacterAdapter.java
index 3bf6f1a92..295379dd6 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/CharacterAdapter.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/CharacterAdapter.java
@@ -21,7 +21,7 @@ public class CharacterAdapter implements TypeAdapter<Character> {
      * @return the parsed Char or an empty Optional if the parsing fails
      */
     @Override
-    public Optional<Character> parse(@NotNull String raw, @NotNull Context context) {
+    public Optional<Character> apply(@NotNull String raw, @NotNull Context context) {
         if (raw.length() == 1) {
             return Optional.of(raw.charAt(0));
         }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/DoubleAdapter.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/DoubleAdapter.java
index daf8ba35e..891ba7202 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/DoubleAdapter.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/DoubleAdapter.java
@@ -21,7 +21,7 @@ public class DoubleAdapter implements TypeAdapter<Double> {
      * @return the parsed Double or an empty Optional if the parsing fails
      */
     @Override
-    public Optional<Double> parse(@NotNull String raw, @NotNull Context context) {
+    public Optional<Double> apply(@NotNull String raw, @NotNull Context context) {
         try {
             return Optional.of(Double.valueOf(raw));
         } catch (NumberFormatException ignored) {
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/FloatAdapter.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/FloatAdapter.java
index 46917917d..5fd3b5c2e 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/FloatAdapter.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/FloatAdapter.java
@@ -21,7 +21,7 @@ public class FloatAdapter implements TypeAdapter<Float> {
      * @return the parsed Float or an empty Optional if the parsing fails
      */
     @Override
-    public Optional<Float> parse(@NotNull String raw, @NotNull Context context) {
+    public Optional<Float> apply(@NotNull String raw, @NotNull Context context) {
         try {
             return Optional.of(Float.valueOf(raw));
         } catch (NumberFormatException ignored) {
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/GuildChannelAdapter.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/GuildChannelAdapter.java
index b4e881646..aaa78ed8f 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/GuildChannelAdapter.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/GuildChannelAdapter.java
@@ -1,8 +1,8 @@
 package com.github.kaktushose.jda.commands.dispatching.adapter.impl;
 
+import com.github.kaktushose.jda.commands.Helpers;
 import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapter;
 import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
-import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.channel.Channel;
 import net.dv8tion.jda.api.entities.channel.middleman.GuildChannel;
 import org.jetbrains.annotations.NotNull;
@@ -24,26 +24,12 @@ public class GuildChannelAdapter implements TypeAdapter<GuildChannel> {
      * @return the parsed {@link GuildChannel} or an empty Optional if the parsing fails
      */
     @Override
-    public Optional<GuildChannel> parse(@NotNull String raw, @NotNull Context context) {
+    public Optional<GuildChannel> apply(@NotNull String raw, @NotNull Context context) {
         Channel channel = context.getEvent().getChannel();
         if (channel == null) {
             return Optional.empty();
         }
 
-        GuildChannel guildChannel;
-        raw = sanitizeMention(raw);
-
-        Guild guild = context.getEvent().getGuild();
-        if (raw.matches("\\d+")) {
-            guildChannel = guild.getGuildChannelById(raw);
-        } else {
-            String finalRaw = raw;
-            guildChannel = guild.getChannels().stream().filter(it -> it.getName().equalsIgnoreCase(finalRaw))
-                    .findFirst().orElse(null);
-        }
-        if (guildChannel == null) {
-            return Optional.empty();
-        }
-        return Optional.of(guildChannel);
+        return Helpers.resolveGuildChannel(context, raw);
     }
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/GuildMessageChannelAdapter.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/GuildMessageChannelAdapter.java
index 9935563fd..917285bdd 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/GuildMessageChannelAdapter.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/GuildMessageChannelAdapter.java
@@ -1,10 +1,9 @@
 package com.github.kaktushose.jda.commands.dispatching.adapter.impl;
 
+import com.github.kaktushose.jda.commands.Helpers;
 import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapter;
 import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
-import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.channel.Channel;
-import net.dv8tion.jda.api.entities.channel.middleman.GuildChannel;
 import net.dv8tion.jda.api.entities.channel.middleman.GuildMessageChannel;
 import org.jetbrains.annotations.NotNull;
 
@@ -25,29 +24,14 @@ public class GuildMessageChannelAdapter implements TypeAdapter<GuildMessageChann
      * @return the parsed {@link GuildMessageChannel} or an empty Optional if the parsing fails
      */
     @Override
-    public Optional<GuildMessageChannel> parse(@NotNull String raw, @NotNull Context context) {
+    public Optional<GuildMessageChannel> apply(@NotNull String raw, @NotNull Context context) {
         Channel channel = context.getEvent().getChannel();
         if (channel == null) {
             return Optional.empty();
         }
 
-        GuildChannel guildChannel;
-        raw = sanitizeMention(raw);
-
-        Guild guild = context.getEvent().getGuild();
-        if (raw.matches("\\d+")) {
-            guildChannel = guild.getGuildChannelById(raw);
-        } else {
-            String finalRaw = raw;
-            guildChannel = guild.getChannels().stream().filter(it -> it.getName().equalsIgnoreCase(finalRaw))
-                    .findFirst().orElse(null);
-        }
-        if (guildChannel == null) {
-            return Optional.empty();
-        }
-        if (!guildChannel.getType().isMessage()) {
-            return Optional.empty();
-        }
-        return Optional.of((GuildMessageChannel) guildChannel);
+        return Helpers.resolveGuildChannel(context, raw)
+                .filter(it -> it.getType().isMessage())
+                .map(GuildMessageChannel.class::cast);
     }
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/IntegerAdapter.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/IntegerAdapter.java
index 31cb6d39f..af18275a0 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/IntegerAdapter.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/IntegerAdapter.java
@@ -21,7 +21,7 @@ public class IntegerAdapter implements TypeAdapter<Integer> {
      * @return the parsed Integer or an empty Optional if the parsing fails
      */
     @Override
-    public Optional<Integer> parse(@NotNull String raw, @NotNull Context context) {
+    public Optional<Integer> apply(@NotNull String raw, @NotNull Context context) {
         try {
             return Optional.of((int) Double.parseDouble(raw));
         } catch (NumberFormatException ignored) {
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/LongAdapter.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/LongAdapter.java
index 54f585e46..7b753cf47 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/LongAdapter.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/LongAdapter.java
@@ -21,7 +21,7 @@ public class LongAdapter implements TypeAdapter<Long> {
      * @return the parsed Long or an empty Optional if the parsing fails
      */
     @Override
-    public Optional<Long> parse(@NotNull String raw, @NotNull Context context) {
+    public Optional<Long> apply(@NotNull String raw, @NotNull Context context) {
         try {
             return Optional.of((long) Double.parseDouble(raw));
         } catch (NumberFormatException ignored) {
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/MemberAdapter.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/MemberAdapter.java
index e50fa771a..e7faf5e64 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/MemberAdapter.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/MemberAdapter.java
@@ -1,5 +1,6 @@
 package com.github.kaktushose.jda.commands.dispatching.adapter.impl;
 
+import com.github.kaktushose.jda.commands.Helpers;
 import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapter;
 import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
 import net.dv8tion.jda.api.entities.Guild;
@@ -24,13 +25,13 @@ public class MemberAdapter implements TypeAdapter<Member> {
      * @return the parsed {@link Member} or an empty Optional if the parsing fails
      */
     @Override
-    public Optional<Member> parse(@NotNull String raw, @NotNull Context context) {
+    public Optional<Member> apply(@NotNull String raw, @NotNull Context context) {
         if (context.getEvent().getGuild() == null) {
             return Optional.empty();
         }
 
         Member member;
-        raw = sanitizeMention(raw);
+        raw = Helpers.sanitizeMention(raw);
 
         Guild guild = context.getEvent().getGuild();
         if (raw.matches("\\d+")) {
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/NewsChannelAdapter.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/NewsChannelAdapter.java
index 924b020e8..778e7f94a 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/NewsChannelAdapter.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/NewsChannelAdapter.java
@@ -1,8 +1,8 @@
 package com.github.kaktushose.jda.commands.dispatching.adapter.impl;
 
+import com.github.kaktushose.jda.commands.Helpers;
 import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapter;
 import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
-import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.channel.Channel;
 import net.dv8tion.jda.api.entities.channel.concrete.NewsChannel;
 import org.jetbrains.annotations.NotNull;
@@ -24,24 +24,12 @@ public class NewsChannelAdapter implements TypeAdapter<NewsChannel> {
      * @return the parsed {@link NewsChannel} or an empty Optional if the parsing fails
      */
     @Override
-    public Optional<NewsChannel> parse(@NotNull String raw, @NotNull Context context) {
+    public Optional<NewsChannel> apply(@NotNull String raw, @NotNull Context context) {
         Channel channel = context.getEvent().getChannel();
         if (channel == null) {
             return Optional.empty();
         }
 
-        NewsChannel newsChannel;
-        raw = sanitizeMention(raw);
-
-        Guild guild = context.getEvent().getGuild();
-        if (raw.matches("\\d+")) {
-            newsChannel = guild.getNewsChannelById(raw);
-        } else {
-            newsChannel = guild.getNewsChannelsByName(raw, true).stream().findFirst().orElse(null);
-        }
-        if (newsChannel == null) {
-            return Optional.empty();
-        }
-        return Optional.of(newsChannel);
+        return Helpers.resolveGuildChannel(context, raw).filter(NewsChannel.class::isInstance).map(NewsChannel.class::cast);
     }
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/RoleAdapter.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/RoleAdapter.java
index 43af60261..7f0de03da 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/RoleAdapter.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/RoleAdapter.java
@@ -1,5 +1,6 @@
 package com.github.kaktushose.jda.commands.dispatching.adapter.impl;
 
+import com.github.kaktushose.jda.commands.Helpers;
 import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapter;
 import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
 import net.dv8tion.jda.api.entities.Guild;
@@ -23,13 +24,13 @@ public class RoleAdapter implements TypeAdapter<Role> {
      * @return the parsed {@link Role} or an empty Optional if the parsing fails
      */
     @Override
-    public Optional<Role> parse(@NotNull String raw, @NotNull Context context) {
+    public Optional<Role> apply(@NotNull String raw, @NotNull Context context) {
         if (context.getEvent().getGuild() == null) {
             return Optional.empty();
         }
 
         Role role;
-        raw = sanitizeMention(raw);
+        raw = Helpers.sanitizeMention(raw);
 
         Guild guild = context.getEvent().getGuild();
         if (raw.matches("\\d+")) {
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/ShortAdapter.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/ShortAdapter.java
index 03d4396b1..8a4d4fe34 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/ShortAdapter.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/ShortAdapter.java
@@ -21,7 +21,7 @@ public class ShortAdapter implements TypeAdapter<Short> {
      * @return the parsed Short or an empty Optional if the parsing fails
      */
     @Override
-    public Optional<Short> parse(@NotNull String raw, @NotNull Context context) {
+    public Optional<Short> apply(@NotNull String raw, @NotNull Context context) {
         try {
             return Optional.of(Short.valueOf(raw));
         } catch (NumberFormatException ignored) {
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/StageChannelAdapter.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/StageChannelAdapter.java
index 54e0fcb36..4e57998cd 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/StageChannelAdapter.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/StageChannelAdapter.java
@@ -1,8 +1,8 @@
 package com.github.kaktushose.jda.commands.dispatching.adapter.impl;
 
+import com.github.kaktushose.jda.commands.Helpers;
 import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapter;
 import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
-import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.channel.Channel;
 import net.dv8tion.jda.api.entities.channel.concrete.StageChannel;
 import org.jetbrains.annotations.NotNull;
@@ -24,24 +24,12 @@ public class StageChannelAdapter implements TypeAdapter<StageChannel> {
      * @return the parsed {@link StageChannel} or an empty Optional if the parsing fails
      */
     @Override
-    public Optional<StageChannel> parse(@NotNull String raw, @NotNull Context context) {
+    public Optional<StageChannel> apply(@NotNull String raw, @NotNull Context context) {
         Channel channel = context.getEvent().getChannel();
         if (channel == null) {
             return Optional.empty();
         }
 
-        StageChannel stageChannel;
-        raw = sanitizeMention(raw);
-
-        Guild guild = context.getEvent().getGuild();
-        if (raw.matches("\\d+")) {
-            stageChannel = guild.getStageChannelById(raw);
-        } else {
-            stageChannel = guild.getStageChannelsByName(raw, true).stream().findFirst().orElse(null);
-        }
-        if (stageChannel == null) {
-            return Optional.empty();
-        }
-        return Optional.of(stageChannel);
+        return Helpers.resolveGuildChannel(context, raw).filter(StageChannel.class::isInstance).map(StageChannel.class::cast);
     }
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/TextChannelAdapter.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/TextChannelAdapter.java
index 02618557f..38dd0a4a0 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/TextChannelAdapter.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/TextChannelAdapter.java
@@ -1,8 +1,8 @@
 package com.github.kaktushose.jda.commands.dispatching.adapter.impl;
 
+import com.github.kaktushose.jda.commands.Helpers;
 import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapter;
 import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
-import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
 import org.jetbrains.annotations.NotNull;
 
@@ -23,23 +23,11 @@ public class TextChannelAdapter implements TypeAdapter<TextChannel> {
      * @return the parsed {@link TextChannel} or an empty Optional if the parsing fails
      */
     @Override
-    public Optional<TextChannel> parse(@NotNull String raw, @NotNull Context context) {
+    public Optional<TextChannel> apply(@NotNull String raw, @NotNull Context context) {
         if (context.getEvent().getGuild() == null) {
             return Optional.empty();
         }
 
-        TextChannel textChannel;
-        raw = sanitizeMention(raw);
-
-        Guild guild = context.getEvent().getGuild();
-        if (raw.matches("\\d+")) {
-            textChannel = guild.getTextChannelById(raw);
-        } else {
-            textChannel = guild.getTextChannelsByName(raw, true).stream().findFirst().orElse(null);
-        }
-        if (textChannel == null) {
-            return Optional.empty();
-        }
-        return Optional.of(textChannel);
+        return Helpers.resolveGuildChannel(context, raw).filter(TextChannel.class::isInstance).map(TextChannel.class::cast);
     }
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/ThreadChannelAdapter.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/ThreadChannelAdapter.java
index 259575634..7a797d9c1 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/ThreadChannelAdapter.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/ThreadChannelAdapter.java
@@ -1,8 +1,8 @@
 package com.github.kaktushose.jda.commands.dispatching.adapter.impl;
 
+import com.github.kaktushose.jda.commands.Helpers;
 import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapter;
 import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
-import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.channel.Channel;
 import net.dv8tion.jda.api.entities.channel.concrete.ThreadChannel;
 import org.jetbrains.annotations.NotNull;
@@ -24,24 +24,12 @@ public class ThreadChannelAdapter implements TypeAdapter<ThreadChannel> {
      * @return the parsed {@link ThreadChannel} or an empty Optional if the parsing fails
      */
     @Override
-    public Optional<ThreadChannel> parse(@NotNull String raw, @NotNull Context context) {
+    public Optional<ThreadChannel> apply(@NotNull String raw, @NotNull Context context) {
         Channel channel = context.getEvent().getChannel();
         if (channel == null) {
             return Optional.empty();
         }
 
-        ThreadChannel threadChannel;
-        raw = sanitizeMention(raw);
-
-        Guild guild = context.getEvent().getGuild();
-        if (raw.matches("\\d+")) {
-            threadChannel = guild.getThreadChannelById(raw);
-        } else {
-            threadChannel = guild.getThreadChannelsByName(raw, true).stream().findFirst().orElse(null);
-        }
-        if (threadChannel == null) {
-            return Optional.empty();
-        }
-        return Optional.of(threadChannel);
+        return Helpers.resolveGuildChannel(context, raw).filter(ThreadChannel.class::isInstance).map(ThreadChannel.class::cast);
     }
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/UserAdapter.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/UserAdapter.java
index 75a07cde4..314f8cb59 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/UserAdapter.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/UserAdapter.java
@@ -1,5 +1,6 @@
 package com.github.kaktushose.jda.commands.dispatching.adapter.impl;
 
+import com.github.kaktushose.jda.commands.Helpers;
 import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapter;
 import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
 import net.dv8tion.jda.api.JDA;
@@ -24,9 +25,9 @@ public class UserAdapter implements TypeAdapter<User> {
      * @return the parsed {@link User} or an empty Optional if the parsing fails
      */
     @Override
-    public Optional<User> parse(@NotNull String raw, @NotNull Context context) {
+    public Optional<User> apply(@NotNull String raw, @NotNull Context context) {
         User user;
-        raw = sanitizeMention(raw);
+        raw = Helpers.sanitizeMention(raw);
         JDA jda = context.getEvent().getJDA();
         if (raw.matches("\\d+")) {
             try {
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/VoiceChannelAdapter.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/VoiceChannelAdapter.java
index be4f910e1..6a804e3a2 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/VoiceChannelAdapter.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/VoiceChannelAdapter.java
@@ -1,8 +1,8 @@
 package com.github.kaktushose.jda.commands.dispatching.adapter.impl;
 
+import com.github.kaktushose.jda.commands.Helpers;
 import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapter;
 import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
-import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.channel.Channel;
 import net.dv8tion.jda.api.entities.channel.concrete.VoiceChannel;
 import org.jetbrains.annotations.NotNull;
@@ -24,24 +24,12 @@ public class VoiceChannelAdapter implements TypeAdapter<VoiceChannel> {
      * @return the parsed {@link VoiceChannel} or an empty Optional if the parsing fails
      */
     @Override
-    public Optional<VoiceChannel> parse(@NotNull String raw, @NotNull Context context) {
+    public Optional<VoiceChannel> apply(@NotNull String raw, @NotNull Context context) {
         Channel channel = context.getEvent().getChannel();
         if (channel == null) {
             return Optional.empty();
         }
 
-        VoiceChannel voiceChannel;
-        raw = sanitizeMention(raw);
-
-        Guild guild = context.getEvent().getGuild();
-        if (raw.matches("\\d+")) {
-            voiceChannel = guild.getVoiceChannelById(raw);
-        } else {
-            voiceChannel = guild.getVoiceChannelsByName(raw, true).stream().findFirst().orElse(null);
-        }
-        if (voiceChannel == null) {
-            return Optional.empty();
-        }
-        return Optional.of(voiceChannel);
+        return Helpers.resolveGuildChannel(context, raw).filter(VoiceChannel.class::isInstance).map(VoiceChannel.class::cast);
     }
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/Context.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/Context.java
index 77bb2f12a..1959eac86 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/Context.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/Context.java
@@ -1,9 +1,9 @@
 package com.github.kaktushose.jda.commands.dispatching.interactions;
 
-import com.github.kaktushose.jda.commands.JDACommands;
 import com.github.kaktushose.jda.commands.dispatching.KeyValueStore;
 import com.github.kaktushose.jda.commands.dispatching.RuntimeSupervisor.InteractionRuntime;
 import com.github.kaktushose.jda.commands.reflect.ImplementationRegistry;
+import com.github.kaktushose.jda.commands.reflect.InteractionRegistry;
 import com.github.kaktushose.jda.commands.reflect.interactions.GenericInteractionDefinition;
 import net.dv8tion.jda.api.entities.Message;
 import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent;
@@ -24,22 +24,22 @@ public class Context {
     protected final GenericInteractionCreateEvent event;
     protected MessageCreateData errorMessage;
     protected ImplementationRegistry registry;
-    protected JDACommands jdaCommands;
     protected boolean cancelled;
     protected boolean ephemeral;
     protected InteractionRuntime runtime;
     protected GenericInteractionDefinition interactionDefinition;
+    protected final InteractionRegistry interactionRegistry;
+    protected final ImplementationRegistry implementationRegistry;
 
     /**
      * Constructs a new GenericContext.
      *
-     * @param jdaCommands the corresponding {@link JDACommands} instance
-     * @param event       the corresponding {@link GenericInteractionCreateEvent}
+     * @param event the corresponding {@link GenericInteractionCreateEvent}
      */
-    public Context(GenericInteractionCreateEvent event, JDACommands jdaCommands) {
+    public Context(GenericInteractionCreateEvent event, InteractionRegistry interactionRegistry, ImplementationRegistry implementationRegistry) {
         this.event = event;
-        this.jdaCommands = jdaCommands;
-        this.registry = jdaCommands.getImplementationRegistry();
+        this.interactionRegistry = interactionRegistry;
+        this.implementationRegistry = implementationRegistry;
     }
 
     public GenericInteractionCreateEvent getEvent() {
@@ -56,16 +56,6 @@ public MessageCreateData getErrorMessage() {
         return errorMessage;
     }
 
-    /**
-     * Gets the corresponding {@link ImplementationRegistry} instance.
-     *
-     * @return the corresponding {@link ImplementationRegistry} instance
-     */
-    @NotNull
-    public ImplementationRegistry getImplementationRegistry() {
-        return registry;
-    }
-
     /**
      * Set the {@link ImplementationRegistry} instance.
      *
@@ -78,28 +68,6 @@ public Context setImplementationRegistry(@NotNull ImplementationRegistry registr
         return this;
     }
 
-    /**
-     * Gets the corresponding {@link JDACommands} instance.
-     *
-     * @return the corresponding {@link JDACommands} instance
-     */
-    @NotNull
-    public JDACommands getJdaCommands() {
-        return jdaCommands;
-    }
-
-    /**
-     * Set the {@link JDACommands} instance.
-     *
-     * @param jdaCommands the {@link JDACommands} instance
-     * @return the current Context instance
-     */
-    @NotNull
-    public Context setJdaCommands(@NotNull JDACommands jdaCommands) {
-        this.jdaCommands = jdaCommands;
-        return this;
-    }
-
     /**
      * Whether the context should be cancelled.
      *
@@ -210,4 +178,12 @@ public Context setKeyValueStore(KeyValueStore keyValueStore) {
         runtime.setKeyValueStore(keyValueStore);
         return this;
     }
+
+    public ImplementationRegistry getImplementationRegistry() {
+        return implementationRegistry;
+    }
+
+    public InteractionRegistry getInteractionRegistry() {
+        return interactionRegistry;
+    }
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/GenericDispatcher.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/GenericDispatcher.java
index c20a3a844..26c05690d 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/GenericDispatcher.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/GenericDispatcher.java
@@ -1,6 +1,5 @@
 package com.github.kaktushose.jda.commands.dispatching.interactions;
 
-import com.github.kaktushose.jda.commands.JDACommands;
 import com.github.kaktushose.jda.commands.dispatching.RuntimeSupervisor;
 import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapterRegistry;
 import com.github.kaktushose.jda.commands.dispatching.middleware.Middleware;
@@ -20,7 +19,6 @@ public abstract class GenericDispatcher {
 
     private final static Logger log = LoggerFactory.getLogger(GenericDispatcher.class);
 
-    protected final JDACommands jdaCommands;
     protected final MiddlewareRegistry middlewareRegistry;
     protected final ImplementationRegistry implementationRegistry;
     protected final InteractionRegistry interactionRegistry;
@@ -29,51 +27,42 @@ public abstract class GenericDispatcher {
 
     /**
      * Constructs a new GenericDispatcher.
-     *
-     * @param jdaCommands the corresponding {@link JDACommands} instance.
      */
-    public GenericDispatcher(JDACommands jdaCommands) {
-        this.jdaCommands = jdaCommands;
-        middlewareRegistry = jdaCommands.getMiddlewareRegistry();
-        implementationRegistry = jdaCommands.getImplementationRegistry();
-        interactionRegistry = jdaCommands.getInteractionRegistry();
-        adapterRegistry = jdaCommands.getAdapterRegistry();
-        runtimeSupervisor = jdaCommands.getRuntimeSupervisor();
+    public GenericDispatcher(MiddlewareRegistry middlewareRegistry,
+                             ImplementationRegistry implementationRegistry,
+                             InteractionRegistry interactionRegistry,
+                             TypeAdapterRegistry adapterRegistry,
+                             RuntimeSupervisor runtimeSupervisor) {
+        this.middlewareRegistry = middlewareRegistry;
+        this.implementationRegistry = implementationRegistry;
+        this.interactionRegistry = interactionRegistry;
+        this.adapterRegistry = adapterRegistry;
+        this.runtimeSupervisor = runtimeSupervisor;
     }
 
     protected void executeMiddlewares(Context context) {
         log.debug("Executing middlewares...");
 
         for (Middleware middleware : middlewareRegistry.getMiddlewares(Priority.PERMISSIONS)) {
-            log.debug("Executing middleware {}", middleware.getClass().getSimpleName());
-            middleware.execute(context);
-            if (context.isCancelled()) {
-                return;
-            }
+            if (executeMiddleware(context, middleware)) return;
         }
         for (Middleware middleware : middlewareRegistry.getMiddlewares(Priority.HIGH)) {
-            log.debug("Executing middleware {}", middleware.getClass().getSimpleName());
-            middleware.execute(context);
-            if (context.isCancelled()) {
-                return;
-            }
+            if (executeMiddleware(context, middleware)) return;
         }
         for (Middleware middleware : middlewareRegistry.getMiddlewares(Priority.NORMAL)) {
-            log.debug("Executing middleware {}", middleware.getClass().getSimpleName());
-            middleware.execute(context);
-            if (context.isCancelled()) {
-                return;
-            }
+            if (executeMiddleware(context, middleware)) return;
         }
         for (Middleware middleware : middlewareRegistry.getMiddlewares(Priority.LOW)) {
-            log.debug("Executing middleware {}", middleware.getClass().getSimpleName());
-            middleware.execute(context);
-            if (context.isCancelled()) {
-                return;
-            }
+            if (executeMiddleware(context, middleware)) return;
         }
     }
 
+    private boolean executeMiddleware(Context context, Middleware middleware) {
+        log.debug("Executing middleware {}", middleware.getClass().getSimpleName());
+        middleware.accept(context);
+        return context.isCancelled();
+    }
+
     /**
      * Dispatches a {@link Context}.
      *
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/GenericEvent.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/GenericEvent.java
index 8c732a70b..40236932e 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/GenericEvent.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/GenericEvent.java
@@ -1,7 +1,8 @@
 package com.github.kaktushose.jda.commands.dispatching.interactions;
 
-import com.github.kaktushose.jda.commands.JDACommands;
-import com.github.kaktushose.jda.commands.reflect.interactions.GenericInteractionDefinition;
+import com.github.kaktushose.jda.commands.reflect.InteractionRegistry;
+import com.github.kaktushose.jda.commands.reflect.interactions.components.ButtonDefinition;
+import com.github.kaktushose.jda.commands.reflect.interactions.components.menus.GenericSelectMenuDefinition;
 import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent;
 import net.dv8tion.jda.api.interactions.components.buttons.Button;
 import net.dv8tion.jda.api.interactions.components.selections.SelectMenu;
@@ -15,30 +16,20 @@
  * @see com.github.kaktushose.jda.commands.dispatching.interactions.modals.ModalEvent ModalEvent
  * @since 4.0.0
  */
-public abstract class GenericEvent<T extends GenericInteractionDefinition> extends GenericInteractionCreateEvent {
+public abstract class GenericEvent extends GenericInteractionCreateEvent {
 
     protected final Context context;
-    private final T definition;
+    private final InteractionRegistry interactionRegistry;
 
     /**
      * Constructs a new GenericEvent.
      *
      * @param context the underlying {@link Context}
      */
-    @SuppressWarnings("unchecked")
-    protected GenericEvent(Context context) {
+    protected GenericEvent(Context context, InteractionRegistry interactionRegistry) {
         super(context.getEvent().getJDA(), context.getEvent().getResponseNumber(), context.getEvent().getInteraction());
-        definition = (T) context.getInteractionDefinition();
         this.context = context;
-    }
-
-    /**
-     * Get the interaction object which describes the component that is executed.
-     *
-     * @return the underlying interaction object
-     */
-    public T getInteractionDefinition() {
-        return definition;
+        this.interactionRegistry = interactionRegistry;
     }
 
     /**
@@ -50,15 +41,6 @@ public Context getContext() {
         return context;
     }
 
-    /**
-     * Get the {@link JDACommands} object.
-     *
-     * @return the {@link JDACommands} object
-     */
-    public JDACommands getJdaCommands() {
-        return context.getJdaCommands();
-    }
-
     /**
      * Gets a JDA {@link Button} to use it for message builders based on the jda-commands id. The returned button will
      * be linked to the runtime of this event.
@@ -73,7 +55,16 @@ public JDACommands getJdaCommands() {
      * @return a JDA {@link Button}
      */
     public Button getButton(String button) {
-        return getJdaCommands().getButton(button, context.getRuntime().getRuntimeId());
+        if (!button.matches("[a-zA-Z]+\\.[a-zA-Z]+")) {
+            throw new IllegalArgumentException("Unknown Button");
+        }
+
+        String sanitizedId = button.replaceAll("\\.", "");
+        ButtonDefinition buttonDefinition = interactionRegistry.getButtons().stream()
+                .filter(it -> it.getDefinitionId().equals(sanitizedId))
+                .findFirst().orElseThrow(() -> new IllegalArgumentException("Unknown Button"));
+
+        return buttonDefinition.toButton().withId(buttonDefinition.createCustomId(context.getRuntime().getRuntimeId()));
     }
 
     /**
@@ -81,7 +72,7 @@ public Button getButton(String button) {
      * SelectMenu will be linked to the runtime of this event.
      *
      * <p>
-     * The id is made up of the simple class name and the method name. E.g. the id of a a select menu defined by a
+     * The id is made up of the simple class name and the method name. E.g. the id of a select menu defined by a
      * {@code onSelectMenu(ComponentEvent event)} method inside an {@code ExampleMenu} class would be
      * {@code ExampleMenu.onSelectMenu}.
      * </p>
@@ -89,25 +80,17 @@ public Button getButton(String button) {
      * @param menu the id of the selectMenu
      * @return a JDA {@link SelectMenu}
      */
-    public SelectMenu getSelectMenu(String menu) {
-        return getJdaCommands().getSelectMenu(menu, context.getRuntime().getRuntimeId());
-    }
+    @SuppressWarnings("unchecked")
+    public <T extends SelectMenu> T getSelectMenu(String menu) {
+        if (!menu.matches("[a-zA-Z]+\\.[a-zA-Z]+")) {
+            throw new IllegalArgumentException("Unknown Select Menu");
+        }
 
-    /**
-     * Gets a JDA {@link SelectMenu} to use it for message builders based on the jda-commands id. The returned
-     * SelectMenu will be linked to the runtime of this event.
-     *
-     * <p>
-     * The id is made up of the simple class name and the method name. E.g. the id of a a select menu defined by a
-     * {@code onSelectMenu(ComponentEvent event)} method inside an {@code ExampleMenu} class would be
-     * {@code ExampleMenu.onSelectMenu}.
-     * </p>
-     *
-     * @param menu  the id of the selectMenu
-     * @param clazz the subtype of {@link SelectMenu}
-     * @return a JDA {@link SelectMenu}
-     */
-    public <S extends SelectMenu> S getSelectMenu(String menu, Class<S> clazz) {
-        return getJdaCommands().getSelectMenu(menu, getContext().getRuntime().getRuntimeId(), clazz);
+        String sanitizedId = menu.replaceAll("\\.", "");
+        GenericSelectMenuDefinition<?> selectMenuDefinition = interactionRegistry.getSelectMenus().stream()
+                .filter(it -> it.getDefinitionId().equals(sanitizedId))
+                .findFirst().orElseThrow(() -> new IllegalArgumentException("Unknown Select Menu"));
+
+        return (T) selectMenuDefinition.toSelectMenu(context.getRuntime().getRuntimeId(), true);
     }
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/autocomplete/AutoCompleteDispatcher.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/autocomplete/AutoCompleteDispatcher.java
index 9f78764aa..34ef20298 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/autocomplete/AutoCompleteDispatcher.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/autocomplete/AutoCompleteDispatcher.java
@@ -1,9 +1,13 @@
 package com.github.kaktushose.jda.commands.dispatching.interactions.autocomplete;
 
-import com.github.kaktushose.jda.commands.JDACommands;
+import com.github.kaktushose.jda.commands.dispatching.RuntimeSupervisor;
+import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapterRegistry;
 import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
 import com.github.kaktushose.jda.commands.dispatching.interactions.GenericDispatcher;
+import com.github.kaktushose.jda.commands.dispatching.middleware.MiddlewareRegistry;
 import com.github.kaktushose.jda.commands.dispatching.reply.ReplyContext;
+import com.github.kaktushose.jda.commands.reflect.ImplementationRegistry;
+import com.github.kaktushose.jda.commands.reflect.InteractionRegistry;
 import com.github.kaktushose.jda.commands.reflect.interactions.AutoCompleteDefinition;
 import net.dv8tion.jda.api.events.interaction.command.CommandAutoCompleteInteractionEvent;
 import org.slf4j.Logger;
@@ -23,17 +27,21 @@ public class AutoCompleteDispatcher extends GenericDispatcher {
     /**
      * Constructs a new AutoCompleteDispatcher.
      *
-     * @param jdaCommands the corresponding {@link JDACommands} instance.
+     * @param middlewareRegistry
+     * @param implementationRegistry
+     * @param interactionRegistry
+     * @param adapterRegistry
+     * @param runtimeSupervisor
      */
-    public AutoCompleteDispatcher(JDACommands jdaCommands) {
-        super(jdaCommands);
+    public AutoCompleteDispatcher(MiddlewareRegistry middlewareRegistry, ImplementationRegistry implementationRegistry, InteractionRegistry interactionRegistry, TypeAdapterRegistry adapterRegistry, RuntimeSupervisor runtimeSupervisor) {
+        super(middlewareRegistry, implementationRegistry, interactionRegistry, adapterRegistry, runtimeSupervisor);
     }
 
     @Override
     public void onEvent(Context context) {
         CommandAutoCompleteInteractionEvent event = (CommandAutoCompleteInteractionEvent) context.getEvent();
         Optional<AutoCompleteDefinition> optionalAutoComplete = interactionRegistry.getAutoCompletes().stream()
-                .filter(it -> it.getCommandNames().contains(event.getFullCommandName()))
+                .filter(it -> it.getCommandNames().stream().anyMatch(name -> event.getFullCommandName().startsWith(name)))
                 .findFirst();
 
         if (optionalAutoComplete.isEmpty()) {
@@ -53,7 +61,7 @@ public void onEvent(Context context) {
         log.debug("Input matches auto complete: {}", autoComplete.getDefinitionId());
         log.info("Executing auto complete {} for user {}", autoComplete.getMethod().getName(), event.getMember());
         try {
-            autoComplete.getMethod().invoke(runtimeSupervisor.newRuntime(autoComplete).getInstance(), new AutoCompleteEvent(context));
+            autoComplete.getMethod().invoke(runtimeSupervisor.newRuntime(autoComplete).getInstance(), new AutoCompleteEvent(context, interactionRegistry));
         } catch (Exception exception) {
             throw new IllegalStateException("Auto complete execution failed!", exception);
         }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/autocomplete/AutoCompleteEvent.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/autocomplete/AutoCompleteEvent.java
index b4584161e..425738cdb 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/autocomplete/AutoCompleteEvent.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/autocomplete/AutoCompleteEvent.java
@@ -2,7 +2,7 @@
 
 import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
 import com.github.kaktushose.jda.commands.dispatching.interactions.GenericEvent;
-import com.github.kaktushose.jda.commands.reflect.interactions.AutoCompleteDefinition;
+import com.github.kaktushose.jda.commands.reflect.InteractionRegistry;
 import net.dv8tion.jda.api.events.interaction.command.CommandAutoCompleteInteractionEvent;
 import net.dv8tion.jda.api.interactions.commands.Command;
 import net.dv8tion.jda.api.interactions.commands.CommandAutoCompleteInteraction;
@@ -21,12 +21,12 @@
  * @see GenericEvent
  * @since 4.0.0
  */
-public class AutoCompleteEvent extends GenericEvent<AutoCompleteDefinition> {
+public class AutoCompleteEvent extends GenericEvent {
 
     private final CommandAutoCompleteInteractionEvent event;
 
-    protected AutoCompleteEvent(Context context) {
-        super(context);
+    protected AutoCompleteEvent(Context context, InteractionRegistry interactionRegistry) {
+        super(context, interactionRegistry);
         event = (CommandAutoCompleteInteractionEvent) context.getEvent();
     }
 
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/commands/CommandDispatcher.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/commands/CommandDispatcher.java
index 62f9288fa..8df5ef346 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/commands/CommandDispatcher.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/commands/CommandDispatcher.java
@@ -1,11 +1,14 @@
 package com.github.kaktushose.jda.commands.dispatching.interactions.commands;
 
-import com.github.kaktushose.jda.commands.JDACommands;
 import com.github.kaktushose.jda.commands.dispatching.RuntimeSupervisor;
+import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapterRegistry;
 import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
 import com.github.kaktushose.jda.commands.dispatching.interactions.GenericDispatcher;
+import com.github.kaktushose.jda.commands.dispatching.middleware.MiddlewareRegistry;
 import com.github.kaktushose.jda.commands.dispatching.reply.ReplyContext;
 import com.github.kaktushose.jda.commands.embeds.ErrorMessageFactory;
+import com.github.kaktushose.jda.commands.reflect.ImplementationRegistry;
+import com.github.kaktushose.jda.commands.reflect.InteractionRegistry;
 import com.github.kaktushose.jda.commands.reflect.interactions.commands.GenericCommandDefinition;
 import com.github.kaktushose.jda.commands.reflect.interactions.commands.SlashCommandDefinition;
 import net.dv8tion.jda.api.events.interaction.command.GenericCommandInteractionEvent;
@@ -31,12 +34,16 @@ public class CommandDispatcher extends GenericDispatcher {
     private static final Logger log = LoggerFactory.getLogger(CommandDispatcher.class);
 
     /**
-     * Constructs a new GenericDispatcher.
+     * Constructs a new CommandDispatcher.
      *
-     * @param jdaCommands the corresponding {@link JDACommands} instance.
+     * @param middlewareRegistry
+     * @param implementationRegistry
+     * @param interactionRegistry
+     * @param adapterRegistry
+     * @param runtimeSupervisor
      */
-    public CommandDispatcher(JDACommands jdaCommands) {
-        super(jdaCommands);
+    public CommandDispatcher(MiddlewareRegistry middlewareRegistry, ImplementationRegistry implementationRegistry, InteractionRegistry interactionRegistry, TypeAdapterRegistry adapterRegistry, RuntimeSupervisor runtimeSupervisor) {
+        super(middlewareRegistry, implementationRegistry, interactionRegistry, adapterRegistry, runtimeSupervisor);
     }
 
     @Override
@@ -68,10 +75,10 @@ public void onEvent(Context context) {
             Map<String, OptionMapping> options = slashContext.getOptionsAsMap();
             List<String> parameters = new ArrayList<>();
             slashCommand.getActualParameters().forEach(param -> {
-                if (!options.containsKey(param.getName())) {
+                if (!options.containsKey(param.name())) {
                     return;
                 }
-                parameters.add(options.get(param.getName()).getAsString());
+                parameters.add(options.get(param.name()).getAsString());
             });
             slashContext.setInput(parameters.toArray(new String[]{}));
 
@@ -81,11 +88,12 @@ public void onEvent(Context context) {
             }
 
             arguments = slashContext.getArguments();
+            arguments.addFirst(new CommandEvent(context, interactionRegistry));
         } else {
-            arguments = new ArrayList<>() {{
-                add(new CommandEvent(context));
-                add(((GenericContextInteractionEvent<?>) event).getTarget());
-            }};
+            arguments = List.of(
+                    new CommandEvent(context, interactionRegistry),
+                    ((GenericContextInteractionEvent<?>) event).getTarget()
+            );
         }
 
         executeMiddlewares(context);
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/commands/CommandEvent.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/commands/CommandEvent.java
index 85d5b71f6..80537979a 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/commands/CommandEvent.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/commands/CommandEvent.java
@@ -4,7 +4,7 @@
 import com.github.kaktushose.jda.commands.dispatching.interactions.GenericEvent;
 import com.github.kaktushose.jda.commands.dispatching.reply.ModalReplyable;
 import com.github.kaktushose.jda.commands.dispatching.reply.ReplyContext;
-import com.github.kaktushose.jda.commands.reflect.interactions.commands.GenericCommandDefinition;
+import com.github.kaktushose.jda.commands.reflect.InteractionRegistry;
 import org.jetbrains.annotations.NotNull;
 
 /**
@@ -15,7 +15,7 @@
  * @see GenericEvent
  * @since 4.0.0
  */
-public class CommandEvent extends GenericEvent<GenericCommandDefinition> implements ModalReplyable {
+public class CommandEvent extends GenericEvent implements ModalReplyable {
 
     private final ReplyContext replyContext;
 
@@ -24,8 +24,8 @@ public class CommandEvent extends GenericEvent<GenericCommandDefinition> impleme
      *
      * @param context the underlying {@link Context}
      */
-    public CommandEvent(@NotNull Context context) {
-        super(context);
+    public CommandEvent(@NotNull Context context, InteractionRegistry interactionRegistry) {
+        super(context, interactionRegistry);
         replyContext = new ReplyContext(context);
     }
 
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/commands/SlashCommandContext.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/commands/SlashCommandContext.java
index f0fee96e1..68bfa9c87 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/commands/SlashCommandContext.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/commands/SlashCommandContext.java
@@ -1,7 +1,8 @@
 package com.github.kaktushose.jda.commands.dispatching.interactions.commands;
 
-import com.github.kaktushose.jda.commands.JDACommands;
 import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
+import com.github.kaktushose.jda.commands.reflect.ImplementationRegistry;
+import com.github.kaktushose.jda.commands.reflect.InteractionRegistry;
 import com.github.kaktushose.jda.commands.reflect.interactions.commands.SlashCommandDefinition;
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
 import net.dv8tion.jda.api.interactions.commands.OptionMapping;
@@ -27,11 +28,10 @@ public class SlashCommandContext extends Context {
     /**
      * Constructs a new CommandContext.
      *
-     * @param event       the corresponding {@link SlashCommandInteractionEvent}
-     * @param jdaCommands the corresponding {@link JDACommands} instance
+     * @param event the corresponding {@link SlashCommandInteractionEvent}
      */
-    public SlashCommandContext(SlashCommandInteractionEvent event, JDACommands jdaCommands) {
-        super(event, jdaCommands);
+    public SlashCommandContext(SlashCommandInteractionEvent event, InteractionRegistry interactionRegistry, ImplementationRegistry implementationRegistry) {
+        super(event, interactionRegistry, implementationRegistry);
         setOptions(event.getOptions());
     }
 
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/components/ComponentDispatcher.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/components/ComponentDispatcher.java
index ebb26ab1e..c6f14199f 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/components/ComponentDispatcher.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/components/ComponentDispatcher.java
@@ -1,11 +1,14 @@
 package com.github.kaktushose.jda.commands.dispatching.interactions.components;
 
-import com.github.kaktushose.jda.commands.JDACommands;
 import com.github.kaktushose.jda.commands.dispatching.RuntimeSupervisor;
+import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapterRegistry;
 import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
 import com.github.kaktushose.jda.commands.dispatching.interactions.GenericDispatcher;
+import com.github.kaktushose.jda.commands.dispatching.middleware.MiddlewareRegistry;
 import com.github.kaktushose.jda.commands.dispatching.reply.ReplyContext;
 import com.github.kaktushose.jda.commands.embeds.ErrorMessageFactory;
+import com.github.kaktushose.jda.commands.reflect.ImplementationRegistry;
+import com.github.kaktushose.jda.commands.reflect.InteractionRegistry;
 import com.github.kaktushose.jda.commands.reflect.interactions.CustomId;
 import com.github.kaktushose.jda.commands.reflect.interactions.EphemeralInteractionDefinition;
 import com.github.kaktushose.jda.commands.reflect.interactions.components.ButtonDefinition;
@@ -34,10 +37,14 @@ public class ComponentDispatcher extends GenericDispatcher {
     /**
      * Constructs a new ComponentDispatcher.
      *
-     * @param jdaCommands the corresponding {@link JDACommands} instance.
+     * @param middlewareRegistry
+     * @param implementationRegistry
+     * @param interactionRegistry
+     * @param adapterRegistry
+     * @param runtimeSupervisor
      */
-    public ComponentDispatcher(JDACommands jdaCommands) {
-        super(jdaCommands);
+    public ComponentDispatcher(MiddlewareRegistry middlewareRegistry, ImplementationRegistry implementationRegistry, InteractionRegistry interactionRegistry, TypeAdapterRegistry adapterRegistry, RuntimeSupervisor runtimeSupervisor) {
+        super(middlewareRegistry, implementationRegistry, interactionRegistry, adapterRegistry, runtimeSupervisor);
     }
 
     @Override
@@ -90,11 +97,11 @@ public void onEvent(Context context) {
         try {
             Class<?> clazz = component.getClass();
             if (EntitySelectMenuDefinition.class.isAssignableFrom(clazz)) {
-                component.getMethod().invoke(runtime.getInstance(), new ComponentEvent(context), ((EntitySelectInteractionEvent) event).getMentions());
+                component.getMethod().invoke(runtime.getInstance(), new ComponentEvent(context, interactionRegistry), ((EntitySelectInteractionEvent) event).getMentions());
             } else if (StringSelectMenuDefinition.class.isAssignableFrom(clazz)) {
-                component.getMethod().invoke(runtime.getInstance(), new ComponentEvent(context), ((StringSelectInteractionEvent) event).getValues());
+                component.getMethod().invoke(runtime.getInstance(), new ComponentEvent(context, interactionRegistry), ((StringSelectInteractionEvent) event).getValues());
             } else if (ButtonDefinition.class.isAssignableFrom(clazz)) {
-                component.getMethod().invoke(runtime.getInstance(), new ComponentEvent(context));
+                component.getMethod().invoke(runtime.getInstance(), new ComponentEvent(context, interactionRegistry));
             } else {
                 throw new IllegalStateException("Unknown component type! Please report this error the the devs of jda-commands.");
             }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/components/ComponentEvent.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/components/ComponentEvent.java
index 854dfca6d..3b742398e 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/components/ComponentEvent.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/components/ComponentEvent.java
@@ -4,7 +4,7 @@
 import com.github.kaktushose.jda.commands.dispatching.interactions.GenericEvent;
 import com.github.kaktushose.jda.commands.dispatching.reply.ModalReplyable;
 import com.github.kaktushose.jda.commands.dispatching.reply.ReplyContext;
-import com.github.kaktushose.jda.commands.reflect.interactions.components.GenericComponentDefinition;
+import com.github.kaktushose.jda.commands.reflect.InteractionRegistry;
 import net.dv8tion.jda.api.utils.messages.MessageCreateData;
 import org.jetbrains.annotations.NotNull;
 
@@ -18,7 +18,7 @@
  * @see GenericEvent
  * @since 4.0.0
  */
-public class ComponentEvent extends GenericEvent<GenericComponentDefinition> implements ModalReplyable {
+public class ComponentEvent extends GenericEvent implements ModalReplyable {
 
     private final ReplyContext replyContext;
 
@@ -27,8 +27,8 @@ public class ComponentEvent extends GenericEvent<GenericComponentDefinition> imp
      *
      * @param context the underlying {@link Context}
      */
-    public ComponentEvent(@NotNull Context context) {
-        super(context);
+    public ComponentEvent(@NotNull Context context, InteractionRegistry interactionRegistry) {
+        super(context, interactionRegistry);
         replyContext = new ReplyContext(context);
     }
 
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/modals/ModalDispatcher.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/modals/ModalDispatcher.java
index 6a89a32d8..533159f74 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/modals/ModalDispatcher.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/modals/ModalDispatcher.java
@@ -1,11 +1,14 @@
 package com.github.kaktushose.jda.commands.dispatching.interactions.modals;
 
-import com.github.kaktushose.jda.commands.JDACommands;
 import com.github.kaktushose.jda.commands.dispatching.RuntimeSupervisor;
+import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapterRegistry;
 import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
 import com.github.kaktushose.jda.commands.dispatching.interactions.GenericDispatcher;
+import com.github.kaktushose.jda.commands.dispatching.middleware.MiddlewareRegistry;
 import com.github.kaktushose.jda.commands.dispatching.reply.ReplyContext;
 import com.github.kaktushose.jda.commands.embeds.ErrorMessageFactory;
+import com.github.kaktushose.jda.commands.reflect.ImplementationRegistry;
+import com.github.kaktushose.jda.commands.reflect.InteractionRegistry;
 import com.github.kaktushose.jda.commands.reflect.interactions.CustomId;
 import com.github.kaktushose.jda.commands.reflect.interactions.ModalDefinition;
 import net.dv8tion.jda.api.events.interaction.ModalInteractionEvent;
@@ -31,10 +34,14 @@ public class ModalDispatcher extends GenericDispatcher {
     /**
      * Constructs a new ModalDispatcher.
      *
-     * @param jdaCommands the corresponding {@link JDACommands} instance.
+     * @param middlewareRegistry
+     * @param implementationRegistry
+     * @param interactionRegistry
+     * @param adapterRegistry
+     * @param runtimeSupervisor
      */
-    public ModalDispatcher(JDACommands jdaCommands) {
-        super(jdaCommands);
+    public ModalDispatcher(MiddlewareRegistry middlewareRegistry, ImplementationRegistry implementationRegistry, InteractionRegistry interactionRegistry, TypeAdapterRegistry adapterRegistry, RuntimeSupervisor runtimeSupervisor) {
+        super(middlewareRegistry, implementationRegistry, interactionRegistry, adapterRegistry, runtimeSupervisor);
     }
 
     @Override
@@ -83,7 +90,7 @@ public void onEvent(Context context) {
         try {
             context.setRuntime(runtime);
             List<Object> arguments = new ArrayList<>();
-            arguments.add(new ModalEvent(context));
+            arguments.add(new ModalEvent(context, interactionRegistry));
             arguments.addAll(event.getValues().stream().map(ModalMapping::getAsString).collect(Collectors.toList()));
             modal.getMethod().invoke(runtime.getInstance(), arguments.toArray());
         } catch (Exception exception) {
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/modals/ModalEvent.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/modals/ModalEvent.java
index b16a100d6..077007b3d 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/modals/ModalEvent.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/modals/ModalEvent.java
@@ -4,7 +4,7 @@
 import com.github.kaktushose.jda.commands.dispatching.interactions.GenericEvent;
 import com.github.kaktushose.jda.commands.dispatching.reply.ReplyContext;
 import com.github.kaktushose.jda.commands.dispatching.reply.Replyable;
-import com.github.kaktushose.jda.commands.reflect.interactions.ModalDefinition;
+import com.github.kaktushose.jda.commands.reflect.InteractionRegistry;
 import org.jetbrains.annotations.NotNull;
 
 /**
@@ -15,12 +15,12 @@
  * @see GenericEvent
  * @since 4.0.0
  */
-public class ModalEvent extends GenericEvent<ModalDefinition> implements Replyable {
+public class ModalEvent extends GenericEvent implements Replyable {
 
     private final ReplyContext replyContext;
 
-    protected ModalEvent(Context context) {
-        super(context);
+    protected ModalEvent(Context context, InteractionRegistry interactionRegistry) {
+        super(context, interactionRegistry);
         replyContext = new ReplyContext(context);
     }
 
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/Middleware.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/Middleware.java
index 7e58022db..3660b336b 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/Middleware.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/Middleware.java
@@ -3,6 +3,8 @@
 import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
 import net.dv8tion.jda.api.utils.messages.MessageCreateData;
 
+import java.util.function.Consumer;
+
 /**
  * Middlewares run just before an interaction event gets dispatched. They are used to perform additional checks or add
  * more info the {@link Context}. Either register them at the {@link MiddlewareRegistry} or use the
@@ -13,7 +15,8 @@
  * @see MiddlewareRegistry
  * @since 4.0.0
  */
-public interface Middleware {
+@FunctionalInterface
+public interface Middleware extends Consumer<Context> {
 
     /**
      * Executes this middleware with the given {@link Context}. Use {@link Context#setCancelled(MessageCreateData)}
@@ -21,6 +24,6 @@ public interface Middleware {
      *
      * @param context the {@link Context} of the current interaction event
      */
-    void execute(Context context);
+    void accept(Context context);
 
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/MiddlewareRegistry.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/MiddlewareRegistry.java
index bcc3c7288..0cf968558 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/MiddlewareRegistry.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/MiddlewareRegistry.java
@@ -22,7 +22,6 @@ public class MiddlewareRegistry {
 
     /**
      * Constructs a new MiddlewareRegistry.
-     *
      */
     public MiddlewareRegistry() {
         middlewares = new HashMap<>();
@@ -37,8 +36,8 @@ public MiddlewareRegistry() {
     /**
      * Register {@link Middleware Middleware(s)} with the given {@link Priority}.
      *
-     * @param priority the {@link Priority} to register the {@link Middleware Middleware(s)} with
-     * @param first the first {@link Middleware} to register
+     * @param priority    the {@link Priority} to register the {@link Middleware Middleware(s)} with
+     * @param first       the first {@link Middleware} to register
      * @param middlewares additional {@link Middleware Middlewares} to register
      * @return this instance for fluent interface
      */
@@ -50,7 +49,7 @@ public MiddlewareRegistry register(Priority priority, Middleware first, Middlewa
     /**
      * Register {@link Middleware Middleware(s)} with the given {@link Priority}.
      *
-     * @param priority the {@link Priority} to register the {@link Middleware Middleware(s)} with
+     * @param priority    the {@link Priority} to register the {@link Middleware Middleware(s)} with
      * @param middlewares the {@link Middleware Middleware(s)} to register
      * @return this instance for fluent interface
      */
@@ -63,8 +62,8 @@ public MiddlewareRegistry register(Priority priority, Collection<Middleware> mid
     /**
      * Unregister {@link Middleware Middleware(s)} with the given {@link Priority}.
      *
-     * @param priority the {@link Priority} to unregister the {@link Middleware Middleware(s)} with
-     * @param first the first {@link Middleware} to unregister
+     * @param priority    the {@link Priority} to unregister the {@link Middleware Middleware(s)} with
+     * @param first       the first {@link Middleware} to unregister
      * @param middlewares additional {@link Middleware Middlewares} to unregister
      * @return this instance for fluent interface
      */
@@ -76,7 +75,7 @@ public MiddlewareRegistry unregister(Priority priority, Middleware first, Middle
     /**
      * Unregister {@link Middleware Middleware(s)} with the given {@link Priority}.
      *
-     * @param priority the {@link Priority} to unregister the {@link Middleware Middleware(s)} with
+     * @param priority    the {@link Priority} to unregister the {@link Middleware Middleware(s)} with
      * @param middlewares the {@link Middleware Middleware(s)} to unregister
      * @return this instance for fluent interface
      */
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/ConstraintMiddleware.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/ConstraintMiddleware.java
index 16e260cd6..c58799f31 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/ConstraintMiddleware.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/ConstraintMiddleware.java
@@ -32,7 +32,7 @@ public class ConstraintMiddleware implements Middleware {
      * @param ctx the {@link Context} to filter
      */
     @Override
-    public void execute(@NotNull Context ctx) {
+    public void accept(@NotNull Context ctx) {
         if (!SlashCommandInteractionEvent.class.isAssignableFrom(ctx.getEvent().getClass())) {
             return;
         }
@@ -44,10 +44,10 @@ public void execute(@NotNull Context ctx) {
         for (int i = 1; i < arguments.size(); i++) {
             Object argument = arguments.get(i);
             ParameterDefinition parameter = parameters.get(i);
-            for (ConstraintDefinition constraint : parameter.getConstraints()) {
-                log.debug("Found constraint {} for parameter {}", constraint, parameter.getType().getName());
+            for (ConstraintDefinition constraint : parameter.constraints()) {
+                log.debug("Found constraint {} for parameter {}", constraint, parameter.type().getName());
 
-                boolean validated = constraint.getValidator().validate(argument, constraint.getAnnotation(), context);
+                boolean validated = constraint.validator().apply(argument, constraint.annotation(), context);
 
                 if (!validated) {
                     context.setCancelled(
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/CooldownMiddleware.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/CooldownMiddleware.java
index ef3542910..638b4aa1a 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/CooldownMiddleware.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/CooldownMiddleware.java
@@ -38,7 +38,7 @@ public CooldownMiddleware() {
      * @param context the {@link Context} to filter
      */
     @Override
-    public void execute(@NotNull Context context) {
+    public void accept(@NotNull Context context) {
         if (!SlashCommandInteractionEvent.class.isAssignableFrom(context.getEvent().getClass())) {
             return;
         }
@@ -68,7 +68,7 @@ public void execute(@NotNull Context context) {
 
         CooldownDefinition cooldown = command.getCooldown();
         long startTime = System.currentTimeMillis();
-        long duration = cooldown.getTimeUnit().toMillis(cooldown.getDelay());
+        long duration = cooldown.timeUnit().toMillis(cooldown.delay());
         activeCooldowns.get(id).add(new CooldownEntry(command, startTime, duration));
         log.debug("Added new cooldown entry for this user");
     }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/PermissionsMiddleware.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/PermissionsMiddleware.java
index d82f73702..13209a6ef 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/PermissionsMiddleware.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/PermissionsMiddleware.java
@@ -34,7 +34,7 @@ public class PermissionsMiddleware implements Middleware {
      * @param context the {@link Context} to filter
      */
     @Override
-    public void execute(@NotNull Context context) {
+    public void accept(@NotNull Context context) {
         log.debug("Checking permissions...");
         PermissionsProvider provider = context.getImplementationRegistry().getPermissionsProvider();
         GenericInteractionCreateEvent event = context.getEvent();
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/ModalReplyable.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/ModalReplyable.java
index 06b5f0f42..c49e6f403 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/ModalReplyable.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/ModalReplyable.java
@@ -29,7 +29,7 @@ default void replyModal(String modal) {
             );
         }
 
-        ModalDefinition modalDefinition = context.getJdaCommands().getInteractionRegistry().getModals().stream()
+        ModalDefinition modalDefinition = context.getInteractionRegistry().getModals().stream()
                 .filter(it -> it.getDefinitionId().equals(String.format("%s%s", context.getInteractionDefinition().getMethod().getDeclaringClass().getSimpleName(), modal)))
                 .findFirst()
                 .orElseThrow(() -> new IllegalArgumentException("Unknown Modal"));
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/Replyable.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/Replyable.java
index e844403c6..1faa089bd 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/Replyable.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/Replyable.java
@@ -146,7 +146,7 @@ default void reply(@NotNull EmbedDTO embedDTO, @Nullable Consumer<Message> succe
 
     /**
      * Adds an {@link ActionRow} to the reply and adds the passed {@link Component Components} to it.
-     * For buttons, they must be defined in the same
+     * For buttonContainers, they must be defined in the same
      * {@link com.github.kaktushose.jda.commands.annotations.interactions.Interaction Interaction} as the referring
      * {@link SlashCommand Command}.
      *
@@ -159,15 +159,15 @@ default Replyable with(@NotNull Component... components) {
         for (Component component : components) {
             if (component instanceof Buttons) {
                 Buttons buttons = (Buttons) component;
-                buttons.getButtonContainer().forEach(container -> {
-                    String id = String.format("%s%s", context.getInteractionDefinition().getMethod().getDeclaringClass().getSimpleName(), container.getName());
-                    context.getJdaCommands().getInteractionRegistry().getButtons()
+                buttons.buttonContainers().forEach(container -> {
+                    String id = String.format("%s%s", context.getInteractionDefinition().getMethod().getDeclaringClass().getSimpleName(), container.name());
+                    context.getInteractionRegistry().getButtons()
                             .stream()
                             .filter(it -> it.getDefinitionId().equals(id))
                             .findFirst()
                             .map(it -> {
-                                Button jdaButton = it.toButton().withDisabled(!container.isEnabled());
-                                //only assign ids to non-link buttons
+                                Button jdaButton = it.toButton().withDisabled(!container.enabled());
+                                //only assign ids to non-link buttonContainers
                                 if (jdaButton.getUrl() == null) {
                                     jdaButton = jdaButton.withId(it.createCustomId(context.getRuntime().getRuntimeId()));
                                 }
@@ -177,9 +177,9 @@ default Replyable with(@NotNull Component... components) {
             }
             if (component instanceof SelectMenus) {
                 SelectMenus menus = (SelectMenus) component;
-                menus.getSelectMenuContainer().forEach(container -> {
+                menus.selectMenuContainers().forEach(container -> {
                     String id = String.format("%s%s", context.getInteractionDefinition().getMethod().getDeclaringClass().getSimpleName(), container.getName());
-                    context.getJdaCommands().getInteractionRegistry().getSelectMenus()
+                    context.getInteractionRegistry().getSelectMenus()
                             .stream()
                             .filter(it -> it.getDefinitionId().equals(id))
                             .findFirst().map(it -> it.toSelectMenu(context.getRuntime().getRuntimeId(), container.isEnabled()))
@@ -212,12 +212,12 @@ default KeyValueStore kv() {
 
     /**
      * Adds an {@link ActionRow} to the reply and adds the passed {@link Component Components} to it.
-     * The buttons must be defined in the same
+     * The buttonContainers must be defined in the same
      * {@link com.github.kaktushose.jda.commands.annotations.interactions.Interaction Interaction} as the referring
-     * {@link SlashCommand Command}. This will enable all buttons. To add
-     * disabled buttons, use {@link #with(Component...)}.
+     * {@link SlashCommand Command}. This will enable all buttonContainers. To add
+     * disabled buttonContainers, use {@link #with(Component...)}.
      *
-     * @param buttons the id of the buttons to add
+     * @param buttons the id of the buttonContainers to add
      * @return the current instance for fluent interface
      */
     default Replyable withButtons(@NotNull String... buttons) {
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/components/Buttons.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/components/Buttons.java
index d5e89e8ff..ddc8e0be0 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/components/Buttons.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/components/Buttons.java
@@ -4,28 +4,27 @@
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 
 /**
- * {@link Component} implementation for buttons. This class can be used to add
+ * {@link Component} implementation for buttonContainers. This class can be used to add
  * {@link com.github.kaktushose.jda.commands.annotations.interactions.Button Buttons} to messages while defining their
  * state (enabled or disabled).
  *
  * @see Replyable#with(Component...)
  * @since 2.3.0
  */
-public class Buttons implements Component {
+public record Buttons(Collection<ButtonContainer> buttonContainers) implements Component {
 
-    private final Collection<ButtonContainer> buttons;
-
-    private Buttons(Collection<ButtonContainer> buttons) {
-        this.buttons = buttons;
+    public Buttons(Collection<ButtonContainer> buttonContainers) {
+        this.buttonContainers = Collections.unmodifiableCollection(buttonContainers);
     }
 
     /**
-     * Add the buttons with the given ids to the reply message as enabled.
+     * Add the buttonContainers with the given ids to the reply message as enabled.
      *
-     * @param buttons the id of the buttons to add
+     * @param buttons the id of the buttonContainers to add
      * @return instance of this class used inside the
      * {@link com.github.kaktushose.jda.commands.dispatching.reply.ReplyContext}
      */
@@ -34,9 +33,9 @@ public static Buttons enabled(String... buttons) {
     }
 
     /**
-     * Add the buttons with the given ids to the reply message as disabled.
+     * Add the buttonContainers with the given ids to the reply message as disabled.
      *
-     * @param buttons the id of the buttons to add
+     * @param buttons the id of the buttonContainers to add
      * @return instance of this class used inside the
      * {@link com.github.kaktushose.jda.commands.dispatching.reply.ReplyContext}
      */
@@ -52,43 +51,9 @@ private static Buttons build(boolean enabled, String... buttons) {
         return new Buttons(result);
     }
 
-    /**
-     * Gets the {@link ButtonContainer}.
-     *
-     * @return the {@link ButtonContainer}
-     */
-    public Collection<ButtonContainer> getButtonContainer() {
-        return buttons;
-    }
-
     /**
      * Contains information about a single {@link com.github.kaktushose.jda.commands.annotations.interactions.Button Button}.
      */
-    public static class ButtonContainer {
-        private final String name;
-        private final boolean enabled;
-
-        private ButtonContainer(String name, boolean enabled) {
-            this.name = name;
-            this.enabled = enabled;
-        }
-
-        /**
-         * Gets the button id.
-         *
-         * @return the button id
-         */
-        public String getName() {
-            return name;
-        }
-
-        /**
-         * Whether the button is enabled or not.
-         *
-         * @return {@code true} if the button is enabled
-         */
-        public boolean isEnabled() {
-            return enabled;
-        }
+    public record ButtonContainer(String name, boolean enabled) {
     }
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/components/Component.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/components/Component.java
index 21b2fc5a9..3e8ec4c33 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/components/Component.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/components/Component.java
@@ -10,5 +10,5 @@
  * @see SelectMenus
  * @since 2.3.0
  */
-public interface Component {
+public sealed interface Component permits Buttons, SelectMenus {
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/components/SelectMenus.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/components/SelectMenus.java
index 29db541ff..1ffac30c4 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/components/SelectMenus.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/components/SelectMenus.java
@@ -4,6 +4,7 @@
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -15,12 +16,10 @@
  * @see Replyable#with(Component...)
  * @since 2.3.0
  */
-public class SelectMenus implements Component {
+public record SelectMenus(Collection<SelectMenus.SelectMenuContainer> selectMenuContainers) implements Component {
 
-    private final Collection<SelectMenus.SelectMenuContainer> selectMenus;
-
-    private SelectMenus(Collection<SelectMenus.SelectMenuContainer> selectMenus) {
-        this.selectMenus = selectMenus;
+    public SelectMenus(Collection<SelectMenus.SelectMenuContainer> selectMenuContainers) {
+        this.selectMenuContainers = Collections.unmodifiableCollection(selectMenuContainers);
     }
 
     /**
@@ -53,15 +52,6 @@ private static SelectMenus build(boolean enabled, String... menus) {
         return new SelectMenus(result);
     }
 
-    /**
-     * Gets the {@link SelectMenuContainer}.
-     *
-     * @return the {@link SelectMenuContainer}
-     */
-    public Collection<SelectMenus.SelectMenuContainer> getSelectMenuContainer() {
-        return selectMenus;
-    }
-
     /**
      * Contains information about a single select menu (either StringSelectMenu or EntitySelectMenu).
      */
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/Validator.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/Validator.java
index 365bebb46..7734c2a5f 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/Validator.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/Validator.java
@@ -10,6 +10,7 @@
  * @see com.github.kaktushose.jda.commands.annotations.constraints.Constraint Constraint
  * @since 2.0.0
  */
+@FunctionalInterface
 public interface Validator {
 
     /**
@@ -20,6 +21,6 @@ public interface Validator {
      * @param context    the corresponding {@link Context}
      * @return {@code true} if the argument passes the constraints
      */
-    boolean validate(@NotNull Object argument, @NotNull Object annotation, @NotNull Context context);
+    boolean apply(@NotNull Object argument, @NotNull Object annotation, @NotNull Context context);
 
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/MaximumValidator.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/MaximumValidator.java
index cbd98f296..6e7902469 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/MaximumValidator.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/MaximumValidator.java
@@ -22,7 +22,7 @@ public class MaximumValidator implements Validator {
      * @return {@code true} if the argument is a number whose value is lower or equal to the specified maximum
      */
     @Override
-    public boolean validate(@NotNull Object argument, @NotNull Object annotation, @NotNull Context context) {
+    public boolean apply(@NotNull Object argument, @NotNull Object annotation, @NotNull Context context) {
         Max max = (Max) annotation;
         return ((Number) argument).longValue() <= max.value();
     }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/MinimumValidator.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/MinimumValidator.java
index 4aebc7d20..2f7982bb3 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/MinimumValidator.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/MinimumValidator.java
@@ -23,7 +23,7 @@ public class MinimumValidator implements Validator {
      * @return {@code true} if the argument is a number whose value is greater or equal to the specified minimum
      */
     @Override
-    public boolean validate(@NotNull Object argument, @NotNull Object annotation, @NotNull Context context) {
+    public boolean apply(@NotNull Object argument, @NotNull Object annotation, @NotNull Context context) {
         Min min = (Min) annotation;
         return ((Number) argument).longValue() >= min.value();
     }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/NotPermissionValidator.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/NotPermissionValidator.java
index 027c47532..541b0236e 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/NotPermissionValidator.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/NotPermissionValidator.java
@@ -29,7 +29,7 @@ public class NotPermissionValidator implements Validator {
      * permission
      */
     @Override
-    public boolean validate(@NotNull Object argument, @NotNull Object annotation, @NotNull Context context) {
+    public boolean apply(@NotNull Object argument, @NotNull Object annotation, @NotNull Context context) {
         Set<Permission> permissions = new HashSet<>();
         NotPerm perm = (NotPerm) annotation;
 
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/NotRoleValidator.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/NotRoleValidator.java
index 155ba5ff4..635f57d8a 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/NotRoleValidator.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/NotRoleValidator.java
@@ -27,10 +27,10 @@ public class NotRoleValidator implements Validator {
      * @return {@code true} if the argument is a user or member that <b>doesn't</b> have the specified guild role
      */
     @Override
-    public boolean validate(@NotNull Object argument, @NotNull Object annotation, @NotNull Context context) {
+    public boolean apply(@NotNull Object argument, @NotNull Object annotation, @NotNull Context context) {
         NotRole roleAnnotation = (NotRole) annotation;
 
-        Optional<Role> optional = new RoleAdapter().parse(roleAnnotation.value(), context);
+        Optional<Role> optional = new RoleAdapter().apply(roleAnnotation.value(), context);
         Member member = (Member) argument;
 
         return optional.filter(role -> member.getRoles().contains(role)).isEmpty();
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/NotUserValidator.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/NotUserValidator.java
index 4f6119cfc..8f10a0af9 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/NotUserValidator.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/NotUserValidator.java
@@ -26,10 +26,10 @@ public class NotUserValidator implements Validator {
      * @return {@code true} if the argument <b>isn't</b> the specified user or member
      */
     @Override
-    public boolean validate(@NotNull Object argument, @NotNull Object annotation, @NotNull Context context) {
+    public boolean apply(@NotNull Object argument, @NotNull Object annotation, @NotNull Context context) {
         Member member = (Member) argument;
         NotUser user = (NotUser) annotation;
-        Optional<Member> optional = new MemberAdapter().parse(user.value(), context);
+        Optional<Member> optional = new MemberAdapter().apply(user.value(), context);
         return optional.filter(member::equals).isEmpty();
     }
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/PermissionValidator.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/PermissionValidator.java
index a3d24e8fe..b2bdef7ac 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/PermissionValidator.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/PermissionValidator.java
@@ -29,7 +29,7 @@ public class PermissionValidator implements Validator {
      * permission
      */
     @Override
-    public boolean validate(@NotNull Object argument, @NotNull Object annotation, @NotNull Context context) {
+    public boolean apply(@NotNull Object argument, @NotNull Object annotation, @NotNull Context context) {
         Set<Permission> permissions = new HashSet<>();
         Perm perm = (Perm) annotation;
         try {
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/RoleValidator.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/RoleValidator.java
index de7134e92..517bdac63 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/RoleValidator.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/RoleValidator.java
@@ -27,11 +27,11 @@ public class RoleValidator implements Validator {
      * @return {@code true} if the argument is a user or member that has the specified guild role
      */
     @Override
-    public boolean validate(@NotNull Object argument, @NotNull Object annotation, @NotNull Context context) {
+    public boolean apply(@NotNull Object argument, @NotNull Object annotation, @NotNull Context context) {
         com.github.kaktushose.jda.commands.annotations.constraints.Role roleAnnotation =
                 (com.github.kaktushose.jda.commands.annotations.constraints.Role) annotation;
 
-        Optional<Role> optional = new RoleAdapter().parse(roleAnnotation.value(), context);
+        Optional<Role> optional = new RoleAdapter().apply(roleAnnotation.value(), context);
         Member member = (Member) argument;
 
         return optional.filter(role -> member.getRoles().contains(role)).isPresent();
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/UserValidator.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/UserValidator.java
index 1d026e2ad..2df8a190e 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/UserValidator.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/UserValidator.java
@@ -26,10 +26,10 @@ public class UserValidator implements Validator {
      * @return {@code true} if the argument is the specified user or member
      */
     @Override
-    public boolean validate(@NotNull Object argument, @NotNull Object annotation, @NotNull Context context) {
+    public boolean apply(@NotNull Object argument, @NotNull Object annotation, @NotNull Context context) {
         Member member = (Member) argument;
         User user = (User) annotation;
-        Optional<Member> optional = new MemberAdapter().parse(user.value(), context);
+        Optional<Member> optional = new MemberAdapter().apply(user.value(), context);
         return optional.filter(member::equals).isPresent();
     }
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/embeds/DefaultErrorMessageFactory.java b/src/main/java/com/github/kaktushose/jda/commands/embeds/DefaultErrorMessageFactory.java
index bf2962fa5..feed5a152 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/embeds/DefaultErrorMessageFactory.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/embeds/DefaultErrorMessageFactory.java
@@ -33,10 +33,10 @@ public MessageCreateData getTypeAdaptingFailedMessage(@NotNull SlashCommandConte
         List<String> arguments = Arrays.asList(context.getInput());
 
         command.getParameters().forEach(parameter -> {
-            if (CommandEvent.class.isAssignableFrom(parameter.getType())) {
+            if (CommandEvent.class.isAssignableFrom(parameter.type())) {
                 return;
             }
-            String typeName = parameter.getType().getTypeName();
+            String typeName = parameter.type().getTypeName();
             if (typeName.contains(".")) {
                 typeName = typeName.substring(typeName.lastIndexOf(".") + 1);
             }
@@ -81,7 +81,7 @@ public MessageCreateData getConstraintFailedMessage(@NotNull Context context, @N
         return new MessageCreateBuilder().setEmbeds(new EmbedBuilder()
                 .setColor(Color.ORANGE)
                 .setTitle("Parameter Error")
-                .setDescription(String.format("```%s```", constraint.getMessage()))
+                .setDescription(String.format("```%s```", constraint.message()))
                 .build()
         ).build();
     }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/embeds/JsonErrorMessageFactory.java b/src/main/java/com/github/kaktushose/jda/commands/embeds/JsonErrorMessageFactory.java
index be7186167..94964f3d9 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/embeds/JsonErrorMessageFactory.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/embeds/JsonErrorMessageFactory.java
@@ -41,10 +41,10 @@ public MessageCreateData getTypeAdaptingFailedMessage(@NotNull SlashCommandConte
         List<String> arguments = Arrays.asList(context.getInput());
 
         command.getParameters().forEach(parameter -> {
-            if (CommandEvent.class.isAssignableFrom(parameter.getType())) {
+            if (CommandEvent.class.isAssignableFrom(parameter.type())) {
                 return;
             }
-            String typeName = parameter.getType().getTypeName();
+            String typeName = parameter.type().getTypeName();
             if (typeName.contains(".")) {
                 typeName = typeName.substring(typeName.lastIndexOf(".") + 1);
             }
@@ -86,7 +86,7 @@ public MessageCreateData getConstraintFailedMessage(@NotNull Context context, @N
             return super.getConstraintFailedMessage(context, constraint);
         }
         return embedCache.getEmbed("constraintFailed")
-                .injectValue("message", constraint.getMessage())
+                .injectValue("message", constraint.message())
                 .toMessageCreateData();
     }
 
@@ -120,8 +120,8 @@ public MessageCreateData getCommandExecutionFailedMessage(@NotNull Context conte
             return super.getCommandExecutionFailedMessage(context, exception);
         }
         String error = String.format("```The user \"%s\" attempted to execute an \"%s\" interaction at %s, " +
-                              "but a \"%s\" occurred. " +
-                              "Please refer to the logs for further information.```",
+                        "but a \"%s\" occurred. " +
+                        "Please refer to the logs for further information.```",
                 context.getEvent().getUser().toString(),
                 context.getEvent().getInteraction().getType(),
                 new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(System.currentTimeMillis()),
diff --git a/src/main/java/com/github/kaktushose/jda/commands/reflect/ConstraintDefinition.java b/src/main/java/com/github/kaktushose/jda/commands/reflect/ConstraintDefinition.java
index 002f52ede..91c63ed48 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/reflect/ConstraintDefinition.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/reflect/ConstraintDefinition.java
@@ -1,7 +1,6 @@
 package com.github.kaktushose.jda.commands.reflect;
 
 import com.github.kaktushose.jda.commands.dispatching.validation.Validator;
-import org.jetbrains.annotations.NotNull;
 
 /**
  * Representation of parameter constraint.
@@ -10,56 +9,5 @@
  * @see Validator
  * @since 2.0.0
  */
-public class ConstraintDefinition {
-
-    private final Validator validator;
-    private final String message;
-    private final Object annotation;
-
-    /**
-     * Constructs a new ConstraintDefinition.
-     *
-     * @param validator  the {@link Validator} to use
-     * @param message    the message to display if the constraint fails
-     * @param annotation an instance of the annotation declaring the constraint
-     */
-    public ConstraintDefinition(@NotNull Validator validator, @NotNull String message, @NotNull Object annotation) {
-        this.validator = validator;
-        this.message = message;
-        this.annotation = annotation;
-    }
-
-    /**
-     * Gets the {@link Validator}.
-     *
-     * @return the {@link Validator}
-     */
-    public Validator getValidator() {
-        return validator;
-    }
-
-    /**
-     * Gets the message to display if the constraint fails.
-     *
-     * @return the message to display if the constraint fails
-     */
-    public String getMessage() {
-        return message;
-    }
-
-    /**
-     * Gets an instance of the annotation declaring the constraint.
-     *
-     * @return an instance of the annotation declaring the constraint
-     */
-    public Object getAnnotation() {
-        return annotation;
-    }
-
-    @Override
-    public String toString() {
-        return "{" +
-                "validator=" + validator.getClass().getName() +
-                ", message='" + message + "'}";
-    }
+public record ConstraintDefinition(Validator validator, String message, Object annotation) {
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/reflect/CooldownDefinition.java b/src/main/java/com/github/kaktushose/jda/commands/reflect/CooldownDefinition.java
index b5049b85a..646a5ea3d 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/reflect/CooldownDefinition.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/reflect/CooldownDefinition.java
@@ -12,16 +12,10 @@
  * @see Cooldown
  * @since 2.0.0
  */
-public class CooldownDefinition {
-
-    private long delay;
-    private TimeUnit timeUnit;
-
-    private CooldownDefinition(long delay, TimeUnit timeUnit) {
-        this.delay = delay;
-        this.timeUnit = timeUnit;
-    }
-
+public record CooldownDefinition(
+        long delay,
+        TimeUnit timeUnit
+) {
     /**
      * Builds a new CooldownDefinition.
      *
@@ -35,59 +29,4 @@ public static CooldownDefinition build(@Nullable Cooldown cooldown) {
         }
         return new CooldownDefinition(cooldown.value(), cooldown.timeUnit());
     }
-
-    /**
-     * Sets the corresponding {@link Cooldown} annotation.
-     *
-     * @param cooldown the new {@link Cooldown} annotation to use
-     */
-    public void set(@Nullable CooldownDefinition cooldown) {
-        if (cooldown == null) {
-            delay = 0;
-            return;
-        }
-        delay = cooldown.delay;
-        timeUnit = cooldown.timeUnit;
-    }
-
-    /**
-     * Gets the cooldown delay.
-     *
-     * @return the cooldown delay
-     */
-    public long getDelay() {
-        return delay;
-    }
-
-    /**
-     * Sets the cooldown delay
-     *
-     * @param delay the new delay
-     */
-    public void setDelay(long delay) {
-        this.delay = delay;
-    }
-
-    /**
-     * Gets the {@link TimeUnit} of the cooldown.
-     *
-     * @return the {@link TimeUnit} of the cooldown
-     */
-    public TimeUnit getTimeUnit() {
-        return timeUnit;
-    }
-
-    /**
-     * Sets the {@link TimeUnit} of the cooldown.
-     *
-     * @param timeUnit the new {@link TimeUnit}
-     */
-    public void setTimeUnit(TimeUnit timeUnit) {
-        this.timeUnit = timeUnit;
-    }
-
-    @Override
-    public String toString() {
-        return "{" + "delay=" + delay + ", timeUnit=" + timeUnit + '}';
-    }
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/reflect/InteractionControllerDefinition.java b/src/main/java/com/github/kaktushose/jda/commands/reflect/InteractionControllerDefinition.java
index d43d0abc7..9f04d4f6b 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/reflect/InteractionControllerDefinition.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/reflect/InteractionControllerDefinition.java
@@ -5,17 +5,14 @@
 import com.github.kaktushose.jda.commands.dependency.DependencyInjector;
 import com.github.kaktushose.jda.commands.dispatching.validation.ValidatorRegistry;
 import com.github.kaktushose.jda.commands.reflect.interactions.AutoCompleteDefinition;
+import com.github.kaktushose.jda.commands.reflect.interactions.GenericInteractionDefinition;
 import com.github.kaktushose.jda.commands.reflect.interactions.ModalDefinition;
 import com.github.kaktushose.jda.commands.reflect.interactions.commands.ContextCommandDefinition;
-import com.github.kaktushose.jda.commands.reflect.interactions.commands.GenericCommandDefinition;
 import com.github.kaktushose.jda.commands.reflect.interactions.commands.SlashCommandDefinition;
 import com.github.kaktushose.jda.commands.reflect.interactions.components.ButtonDefinition;
 import com.github.kaktushose.jda.commands.reflect.interactions.components.menus.EntitySelectMenuDefinition;
-import com.github.kaktushose.jda.commands.reflect.interactions.components.menus.GenericSelectMenuDefinition;
 import com.github.kaktushose.jda.commands.reflect.interactions.components.menus.StringSelectMenuDefinition;
-import net.dv8tion.jda.api.interactions.commands.Command;
 import net.dv8tion.jda.api.interactions.commands.localization.LocalizationFunction;
-import net.dv8tion.jda.api.interactions.components.selections.SelectMenu;
 import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -24,33 +21,17 @@
 import java.lang.reflect.Method;
 import java.util.Optional;
 import java.util.*;
-import java.util.stream.Collectors;
 
 /**
  * Representation of an interaction controller.
  *
  * @since 2.0.0
  */
-public class InteractionControllerDefinition {
+public record InteractionControllerDefinition(
+        Set<GenericInteractionDefinition> definitions
+) {
 
     private static final Logger log = LoggerFactory.getLogger(InteractionControllerDefinition.class);
-    private final List<GenericCommandDefinition> commands;
-    private final List<ButtonDefinition> buttons;
-    private final List<GenericSelectMenuDefinition<? extends SelectMenu>> selectMenus;
-    private final List<AutoCompleteDefinition> autoCompletes;
-    private final List<ModalDefinition> modals;
-
-    private InteractionControllerDefinition(List<GenericCommandDefinition> commands,
-                                            List<ButtonDefinition> buttons,
-                                            List<GenericSelectMenuDefinition<? extends SelectMenu>> selectMenus,
-                                            List<AutoCompleteDefinition> autoCompletes,
-                                            List<ModalDefinition> modals) {
-        this.commands = commands;
-        this.buttons = buttons;
-        this.selectMenus = selectMenus;
-        this.autoCompletes = autoCompletes;
-        this.modals = modals;
-    }
 
     /**
      * Builds a new ControllerDefinition.
@@ -61,197 +42,111 @@ private InteractionControllerDefinition(List<GenericCommandDefinition> commands,
      * @param localizationFunction the {@link LocalizationFunction} to use
      * @return an {@link Optional} holding the ControllerDefinition
      */
-    public static Optional<InteractionControllerDefinition> build(@NotNull Class<?> interactionClass,
-                                                                  @NotNull ValidatorRegistry validatorRegistry,
-                                                                  @NotNull DependencyInjector dependencyInjector,
-                                                                  @NotNull LocalizationFunction localizationFunction) {
+    public static InteractionControllerDefinition build(@NotNull Class<?> interactionClass,
+                                                        @NotNull ValidatorRegistry validatorRegistry,
+                                                        @NotNull DependencyInjector dependencyInjector,
+                                                        @NotNull LocalizationFunction localizationFunction) {
         Interaction interaction = interactionClass.getAnnotation(Interaction.class);
 
-        if (!interaction.isActive()) {
-            log.warn("Interaction class {} is set inactive. Skipping the controller and its commands", interactionClass.getName());
-            return Optional.empty();
-        }
-
-        List<Field> fields = new ArrayList<>();
-        for (Field field : interactionClass.getDeclaredFields()) {
-            if (!field.isAnnotationPresent(Inject.class)) {
-                continue;
-            }
-            fields.add(field);
-        }
+        List<Field> fields = Arrays.stream(interactionClass.getDeclaredFields())
+                .filter(field -> field.isAnnotationPresent(Inject.class))
+                .toList();
         dependencyInjector.registerDependencies(interactionClass, fields);
 
-        final Set<String> permissions = new HashSet<>();
-        // index controller level permissions
-        if (interactionClass.isAnnotationPresent(Permissions.class)) {
-            Permissions permission = interactionClass.getAnnotation(Permissions.class);
-            permissions.addAll(Arrays.stream(permission.value()).collect(Collectors.toSet()));
-        }
+        Permissions permission = interactionClass.getAnnotation(Permissions.class);
+        final Set<String> permissions = permission != null
+                ? Set.of(permission.value())
+                : Set.of();
 
         // get controller level cooldown and use it if no command level cooldown is present
-        CooldownDefinition cooldown = null;
-        if (interactionClass.isAnnotationPresent(Cooldown.class)) {
-            cooldown = CooldownDefinition.build(interactionClass.getAnnotation(Cooldown.class));
-        }
+        Cooldown cooldownAnn = interactionClass.getAnnotation(Cooldown.class);
+        CooldownDefinition cooldown = cooldownAnn != null
+                ? CooldownDefinition.build(cooldownAnn)
+                : null;
+
+
+        Collection<AutoCompleteDefinition> autoCompleteDefinitions = autoCompleteDefinitions(interactionClass);
 
         // index interactions
-        List<GenericCommandDefinition> commands = new ArrayList<>();
-        List<ButtonDefinition> buttons = new ArrayList<>();
-        List<GenericSelectMenuDefinition<? extends SelectMenu>> selectMenus = new ArrayList<>();
-        List<AutoCompleteDefinition> autoCompletes = new ArrayList<>();
-        List<ModalDefinition> modals = new ArrayList<>();
-        for (Method method : interactionClass.getDeclaredMethods()) {
+        Set<GenericInteractionDefinition> interactionDefinitions = interactionDefinitions(
+                interactionClass,
+                validatorRegistry,
+                localizationFunction,
+                interaction,
+                permissions,
+                cooldown,
+                autoCompleteDefinitions
+        );
+
+        // validate auto completes
+        List<SlashCommandDefinition> commandDefinitions = interactionDefinitions.stream()
+                .filter(SlashCommandDefinition.class::isInstance)
+                .map(SlashCommandDefinition.class::cast)
+                .toList();
+
+        autoCompleteDefinitions.stream()
+                .map(AutoCompleteDefinition::getCommandNames)
+                .flatMap(Collection::stream)
+                .filter(name -> commandDefinitions.stream().noneMatch(command -> command.getName().startsWith(name)))
+                .forEach(s -> log.warn("No Command found for auto complete {}", s));
+
+        return new InteractionControllerDefinition(interactionDefinitions);
+    }
 
+    private static Collection<AutoCompleteDefinition> autoCompleteDefinitions(Class<?> interactionClass) {
+        return Arrays.stream(interactionClass.getDeclaredMethods())
+                .filter(method -> method.isAnnotationPresent(AutoComplete.class))
+                .map(AutoCompleteDefinition::build)
+                .flatMap(Optional::stream)
+                .toList();
+    }
+
+    private static Set<GenericInteractionDefinition> interactionDefinitions(Class<?> clazz,
+                                                                            ValidatorRegistry validatorRegistry,
+                                                                            LocalizationFunction localizationFunction,
+                                                                            Interaction interaction,
+                                                                            Set<String> permissions,
+                                                                            CooldownDefinition cooldown,
+                                                                            Collection<AutoCompleteDefinition> autocompletes) {
+        Set<GenericInteractionDefinition> definitions = new HashSet<>(autocompletes);
+        for (Method method : clazz.getDeclaredMethods()) {
+            final MethodBuildContext context = new MethodBuildContext(
+                    validatorRegistry,
+                    localizationFunction,
+                    interaction,
+                    permissions,
+                    cooldown,
+                    method,
+                    autocompletes
+            );
+
+            Optional<? extends GenericInteractionDefinition> definition = Optional.empty();
             // index commands
             if (method.isAnnotationPresent(SlashCommand.class)) {
-                Optional<SlashCommandDefinition> optional = SlashCommandDefinition.build(method, validatorRegistry, localizationFunction);
-                if (optional.isEmpty()) {
-                    continue;
-                }
-                SlashCommandDefinition commandDefinition = optional.get();
-                commandDefinition.getPermissions().addAll(permissions);
-                if (commandDefinition.getCooldown().getDelay() == 0) {
-                    commandDefinition.getCooldown().set(cooldown);
-                }
-                if (interaction.ephemeral()) {
-                    commandDefinition.setEphemeral(true);
-                }
-                commands.add(commandDefinition);
+                definition = SlashCommandDefinition.build(context);
             }
             if (method.isAnnotationPresent(ContextCommand.class)) {
-                Optional<ContextCommandDefinition> optional = ContextCommandDefinition.build(method, localizationFunction);
-                if (optional.isEmpty()) {
-                    continue;
-                }
-                ContextCommandDefinition commandDefinition = optional.get();
-                commandDefinition.getPermissions().addAll(permissions);
-                if (interaction.ephemeral()) {
-                    commandDefinition.setEphemeral(true);
-                }
-                commands.add(commandDefinition);
+                definition = ContextCommandDefinition.build(context);
             }
 
             // index components
             if (method.isAnnotationPresent(Button.class)) {
-                ButtonDefinition.build(method).ifPresent(button -> {
-                    if (interaction.ephemeral()) {
-                        button.setEphemeral(true);
-                    }
-                    button.getPermissions().addAll(permissions);
-                    buttons.add(button);
-                });
+                definition = ButtonDefinition.build(context);
             }
             if (method.isAnnotationPresent(EntitySelectMenu.class)) {
-                EntitySelectMenuDefinition.build(method).ifPresent(menu -> {
-                    if (interaction.ephemeral()) {
-                        menu.setEphemeral(true);
-                    }
-                    menu.getPermissions().addAll(permissions);
-                    selectMenus.add(menu);
-                });
+                definition = EntitySelectMenuDefinition.build(context);
             }
             if (method.isAnnotationPresent(StringSelectMenu.class)) {
-                StringSelectMenuDefinition.build(method).ifPresent(menu -> {
-                    if (interaction.ephemeral()) {
-                        menu.setEphemeral(true);
-                    }
-                    menu.getPermissions().addAll(permissions);
-                    selectMenus.add(menu);
-                });
+                definition = StringSelectMenuDefinition.build(context);
             }
 
             //index modals
             if (method.isAnnotationPresent(Modal.class)) {
-                ModalDefinition.build(method).ifPresent(modal -> {
-                    if (interaction.ephemeral()) {
-                        modal.setEphemeral(true);
-                    }
-                    modal.getPermissions().addAll(permissions);
-                    modals.add(modal);
-                });
+                definition = ModalDefinition.build(method);
             }
-        }
-
-        //loop again and index auto complete
-        for (Method method : interactionClass.getDeclaredMethods()) {
-            if (method.isAnnotationPresent(AutoComplete.class)) {
-                AutoCompleteDefinition.build(
-                        method,
-                        autoCompletes.stream().flatMap(it -> it.getCommandNames().stream()).collect(Collectors.toList())
-                ).ifPresent(autoComplete -> {
-                    autoCompletes.add(autoComplete);
 
-                    Set<String> commandNames = new HashSet<>();
-                    autoComplete.getCommandNames().forEach(name -> commands.stream()
-                            .filter(it -> it.getCommandType() == Command.Type.SLASH)
-                            .filter(command -> command.getName().startsWith(name))
-                            .forEach(command -> {
-                                ((SlashCommandDefinition) command).setAutoComplete(true);
-                                commandNames.add(command.getName());
-                            })
-                    );
-                    autoComplete.setCommandNames(commandNames);
-                });
-            }
+            definition.ifPresent(definitions::add);
         }
-
-        return Optional.of(new InteractionControllerDefinition(commands, buttons, selectMenus, autoCompletes, modals));
+        return definitions;
     }
-
-    /**
-     * Gets a possibly-empty list of all {@link GenericCommandDefinition CommandDefinitions}.
-     *
-     * @return a possibly-empty list of all {@link GenericCommandDefinition CommandDefinitions}
-     */
-    public List<GenericCommandDefinition> getCommands() {
-        return commands;
-    }
-
-    /**
-     * Gets a possibly-empty list of all buttons.
-     *
-     * @return a possibly-empty list of all buttons
-     */
-    public List<ButtonDefinition> getButtons() {
-        return buttons;
-    }
-
-    /**
-     * Gets a possibly-empty list of all select menus.
-     *
-     * @return a possibly-empty list of all select menus
-     */
-    public List<GenericSelectMenuDefinition<? extends SelectMenu>> getSelectMenus() {
-        return selectMenus;
-    }
-
-    /**
-     * Gets a possibly-empty list of all {@link AutoCompleteDefinition AutoCompleteDefinitions}.
-     *
-     * @return a possibly-empty list of all {@link AutoCompleteDefinition AutoCompleteDefinitions}
-     */
-    public Collection<AutoCompleteDefinition> getAutoCompletes() {
-        return autoCompletes;
-    }
-
-    /**
-     * Gets a possibly-empty list of all {@link ModalDefinition ModalDefinitions}.
-     *
-     * @return a possibly-empty list of all {@link ModalDefinition ModalDefinitions}
-     */
-    public List<ModalDefinition> getModals() {
-        return modals;
-    }
-
-    @Override
-    public String toString() {
-        return "ControllerDefinition{" +
-                "commands=" + commands +
-                ", buttons=" + buttons +
-                ", selectMenus=" + selectMenus +
-                ", autoCompletes=" + autoCompletes +
-                ", modals=" + modals +
-                '}';
-    }
-
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/reflect/InteractionRegistry.java b/src/main/java/com/github/kaktushose/jda/commands/reflect/InteractionRegistry.java
index 5d41a5f4a..b50f04e7c 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/reflect/InteractionRegistry.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/reflect/InteractionRegistry.java
@@ -4,13 +4,12 @@
 import com.github.kaktushose.jda.commands.dependency.DependencyInjector;
 import com.github.kaktushose.jda.commands.dispatching.validation.ValidatorRegistry;
 import com.github.kaktushose.jda.commands.reflect.interactions.AutoCompleteDefinition;
+import com.github.kaktushose.jda.commands.reflect.interactions.GenericInteractionDefinition;
 import com.github.kaktushose.jda.commands.reflect.interactions.ModalDefinition;
-import com.github.kaktushose.jda.commands.reflect.interactions.commands.ContextCommandDefinition;
 import com.github.kaktushose.jda.commands.reflect.interactions.commands.GenericCommandDefinition;
 import com.github.kaktushose.jda.commands.reflect.interactions.commands.SlashCommandDefinition;
 import com.github.kaktushose.jda.commands.reflect.interactions.components.ButtonDefinition;
 import com.github.kaktushose.jda.commands.reflect.interactions.components.menus.GenericSelectMenuDefinition;
-import net.dv8tion.jda.api.interactions.commands.Command;
 import net.dv8tion.jda.api.interactions.commands.localization.LocalizationFunction;
 import net.dv8tion.jda.api.interactions.components.selections.SelectMenu;
 import org.jetbrains.annotations.NotNull;
@@ -22,29 +21,22 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.Collections;
+import java.util.Collection;
 import java.util.HashSet;
-import java.util.Optional;
 import java.util.Set;
-import java.util.stream.Collectors;
 
 /**
  * Central registry for all {@link SlashCommandDefinition CommandDefinitions}.
  *
  * @since 2.0.0
  */
-public class InteractionRegistry {
+public final class InteractionRegistry {
 
     private final static Logger log = LoggerFactory.getLogger(InteractionRegistry.class);
     private final ValidatorRegistry validatorRegistry;
     private final DependencyInjector dependencyInjector;
     private final LocalizationFunction localizationFunction;
-    private final Set<InteractionControllerDefinition> controllers;
-    private final Set<GenericCommandDefinition> commands;
-    private final Set<ButtonDefinition> buttons;
-    private final Set<GenericSelectMenuDefinition<? extends SelectMenu>> selectMenus;
-    private final Set<AutoCompleteDefinition> autoCompletes;
-    private final Set<ModalDefinition> modals;
+    private final Set<GenericInteractionDefinition> definitions = new HashSet<>();
 
     /**
      * Constructs a new CommandRegistry.
@@ -59,12 +51,6 @@ public InteractionRegistry(@NotNull ValidatorRegistry validatorRegistry,
         this.validatorRegistry = validatorRegistry;
         this.dependencyInjector = dependencyInjector;
         this.localizationFunction = localizationFunction;
-        controllers = new HashSet<>();
-        commands = new HashSet<>();
-        buttons = new HashSet<>();
-        selectMenus = new HashSet<>();
-        autoCompletes = new HashSet<>();
-        modals = new HashSet<>();
     }
 
     /**
@@ -92,82 +78,56 @@ public void index(@NotNull Class<?> clazz, @NotNull String... packages) {
         for (Class<?> aClass : controllerSet) {
             log.debug("Found interaction controller {}", aClass.getName());
 
-            Optional<InteractionControllerDefinition> optional = InteractionControllerDefinition.build(
+            InteractionControllerDefinition controller = InteractionControllerDefinition.build(
                     aClass,
                     validatorRegistry,
                     dependencyInjector,
                     localizationFunction
             );
 
-            if (optional.isEmpty()) {
-                log.warn("Unable to index the interaction controller!");
-                continue;
-            }
-
-            InteractionControllerDefinition controller = optional.get();
-            controllers.add(controller);
-            commands.addAll(controller.getCommands());
-            buttons.addAll(controller.getButtons());
-            selectMenus.addAll(controller.getSelectMenus());
-            autoCompletes.addAll(controller.getAutoCompletes());
-            modals.addAll(controller.getModals());
+            definitions.addAll(controller.definitions());
             log.debug("Registered interaction controller {}", controller);
         }
 
         log.debug("Successfully registered {} interaction controller(s) with a total of {} interaction(s)!",
-                controllers.size(),
-                commands.size() + buttons.size());
+                controllerSet.size(),
+                definitions.size());
     }
 
     /**
-     * Gets a possibly-empty list of all {@link InteractionControllerDefinition ControllerDefinitions}.
-     *
-     * @return a possibly-empty list of all {@link InteractionControllerDefinition ControllerDefinitions}
-     */
-    public Set<InteractionControllerDefinition> getInteractionControllers() {
-        return Collections.unmodifiableSet(controllers);
-    }
-
-    /**
-     * Gets a possibly-empty list of all {@link GenericCommandDefinition CommandDefinitions}, this includes both
-     * {@link SlashCommandDefinition} and {@link ContextCommandDefinition}.
+     * Gets a possibly-empty list of all {@link GenericCommandDefinition CommandDefinitions}.
      *
      * @return a possibly-empty list of all {@link GenericCommandDefinition CommandDefinitions}
      */
-    public Set<GenericCommandDefinition> getCommands() {
-        return Collections.unmodifiableSet(commands);
-    }
-
-    /**
-     * Gets a possibly-empty list of all {@link SlashCommandDefinition SlashCommandDefinitions}.
-     *
-     * @return a possibly-empty list of all {@link SlashCommandDefinition SlashCommandDefinitions}
-     */
-    public Set<SlashCommandDefinition> getSlashCommands() {
-        return commands.stream().filter(it -> (it.getCommandType() == Command.Type.SLASH))
-                .map(it -> (SlashCommandDefinition) it)
-                .collect(Collectors.toUnmodifiableSet());
+    public Collection<GenericCommandDefinition> getCommands() {
+        return definitions.stream()
+                .filter(GenericCommandDefinition.class::isInstance)
+                .map(GenericCommandDefinition.class::cast)
+                .toList();
     }
 
     /**
-     * Gets a possibly-empty list of all {@link ContextCommandDefinition ContextCommandDefinitions}.
+     * Gets a possibly-empty list of all buttonContainers.
      *
-     * @return a possibly-empty list of all {@link ContextCommandDefinition ContextCommandDefinitions}
+     * @return a possibly-empty list of all buttonContainers
      */
-    public Set<ContextCommandDefinition> getContextCommands() {
-        return commands.stream().filter(it ->
-                        (it.getCommandType() == Command.Type.USER) || it.getCommandType() == Command.Type.MESSAGE)
-                .map(it -> (ContextCommandDefinition) it)
-                .collect(Collectors.toUnmodifiableSet());
+    public Collection<ButtonDefinition> getButtons() {
+        return definitions.stream()
+                .filter(ButtonDefinition.class::isInstance)
+                .map(ButtonDefinition.class::cast)
+                .toList();
     }
 
     /**
-     * Gets a possibly-empty list of all {@link ButtonDefinition ButtonDefinitions}.
+     * Gets a possibly-empty list of all select menus.
      *
-     * @return a possibly-empty list of all {@link ButtonDefinition ButtonDefinitions}
+     * @return a possibly-empty list of all select menus
      */
-    public Set<ButtonDefinition> getButtons() {
-        return Collections.unmodifiableSet(buttons);
+    public Collection<GenericSelectMenuDefinition<? extends SelectMenu>> getSelectMenus() {
+        return definitions.stream()
+                .filter(GenericSelectMenuDefinition.class::isInstance)
+                .<GenericSelectMenuDefinition<? extends SelectMenu>>map(GenericSelectMenuDefinition.class::cast)
+                .toList();
     }
 
     /**
@@ -175,8 +135,11 @@ public Set<ButtonDefinition> getButtons() {
      *
      * @return a possibly-empty list of all {@link AutoCompleteDefinition AutoCompleteDefinitions}
      */
-    public Set<AutoCompleteDefinition> getAutoCompletes() {
-        return Collections.unmodifiableSet(autoCompletes);
+    public Collection<AutoCompleteDefinition> getAutoCompletes() {
+        return definitions.stream()
+                .filter(AutoCompleteDefinition.class::isInstance)
+                .map(AutoCompleteDefinition.class::cast)
+                .toList();
     }
 
     /**
@@ -184,11 +147,10 @@ public Set<AutoCompleteDefinition> getAutoCompletes() {
      *
      * @return a possibly-empty list of all {@link ModalDefinition ModalDefinitions}
      */
-    public Set<GenericSelectMenuDefinition<? extends SelectMenu>> getSelectMenus() {
-        return Collections.unmodifiableSet(selectMenus);
-    }
-
-    public Set<ModalDefinition> getModals() {
-        return Collections.unmodifiableSet(modals);
+    public Collection<ModalDefinition> getModals() {
+        return definitions.stream()
+                .filter(ModalDefinition.class::isInstance)
+                .map(ModalDefinition.class::cast)
+                .toList();
     }
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/reflect/MethodBuildContext.java b/src/main/java/com/github/kaktushose/jda/commands/reflect/MethodBuildContext.java
new file mode 100644
index 000000000..0ca916293
--- /dev/null
+++ b/src/main/java/com/github/kaktushose/jda/commands/reflect/MethodBuildContext.java
@@ -0,0 +1,22 @@
+package com.github.kaktushose.jda.commands.reflect;
+
+import com.github.kaktushose.jda.commands.annotations.interactions.Interaction;
+import com.github.kaktushose.jda.commands.dispatching.validation.ValidatorRegistry;
+import com.github.kaktushose.jda.commands.reflect.interactions.AutoCompleteDefinition;
+import net.dv8tion.jda.api.interactions.commands.localization.LocalizationFunction;
+import org.jetbrains.annotations.NotNull;
+
+import java.lang.reflect.Method;
+import java.util.Collection;
+import java.util.Set;
+
+public record MethodBuildContext(
+        @NotNull ValidatorRegistry validatorRegistry,
+        @NotNull LocalizationFunction localizationFunction,
+        Interaction interaction,
+        Set<String> permissions,
+        CooldownDefinition cooldownDefinition,
+        Method method,
+        Collection<AutoCompleteDefinition> autoCompleteDefinitions
+) {
+}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/reflect/ParameterDefinition.java b/src/main/java/com/github/kaktushose/jda/commands/reflect/ParameterDefinition.java
index 616df8a20..1e9eee659 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/reflect/ParameterDefinition.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/reflect/ParameterDefinition.java
@@ -20,7 +20,6 @@
 import net.dv8tion.jda.api.interactions.commands.OptionType;
 import net.dv8tion.jda.api.interactions.commands.build.OptionData;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.InvocationTargetException;
@@ -28,6 +27,8 @@
 import java.lang.reflect.Parameter;
 import java.util.*;
 
+import static java.util.Map.entry;
+
 /**
  * Representation of a command parameter.
  *
@@ -36,89 +37,65 @@
  * @see Param
  * @since 2.0.0
  */
-public class ParameterDefinition {
-
-    private static final Map<Class<?>, Class<?>> TYPE_MAPPINGS = new HashMap<>() {
-        {
-            put(byte.class, Byte.class);
-            put(short.class, Short.class);
-            put(int.class, Integer.class);
-            put(long.class, Long.class);
-            put(double.class, Double.class);
-            put(float.class, Float.class);
-            put(boolean.class, Boolean.class);
-            put(char.class, Character.class);
-        }
-    };
-
-    private static final Map<Class<?>, OptionType> OPTION_TYPE_MAPPINGS = new HashMap<>() {
-        {
-            put(Byte.class, OptionType.STRING);
-            put(Short.class, OptionType.STRING);
-            put(Integer.class, OptionType.INTEGER);
-            put(Long.class, OptionType.NUMBER);
-            put(Double.class, OptionType.NUMBER);
-            put(Float.class, OptionType.NUMBER);
-            put(Boolean.class, OptionType.BOOLEAN);
-            put(Character.class, OptionType.STRING);
-            put(String.class, OptionType.STRING);
-            put(String[].class, OptionType.STRING);
-            put(User.class, OptionType.USER);
-            put(Member.class, OptionType.USER);
-            put(GuildChannel.class, OptionType.CHANNEL);
-            put(GuildMessageChannel.class, OptionType.CHANNEL);
-            put(ThreadChannel.class, OptionType.CHANNEL);
-            put(TextChannel.class, OptionType.CHANNEL);
-            put(NewsChannel.class, OptionType.CHANNEL);
-            put(AudioChannel.class, OptionType.CHANNEL);
-            put(VoiceChannel.class, OptionType.CHANNEL);
-            put(StageChannel.class, OptionType.CHANNEL);
-            put(Role.class, OptionType.ROLE);
-        }
-    };
-
-    private static final Map<Class<?>, List<ChannelType>> CHANNEL_TYPE_RESTRICTIONS = new HashMap<>() {
-        {
-            put(GuildMessageChannel.class, Collections.singletonList(ChannelType.TEXT));
-            put(ThreadChannel.class, Arrays.asList(
+public record ParameterDefinition(
+        Class<?> type,
+        boolean isOptional,
+        String defaultValue,
+        boolean isPrimitive,
+        String name,
+        String description,
+        List<Choice> choices,
+        List<ConstraintDefinition> constraints
+) {
+
+    private static final Map<Class<?>, Class<?>> TYPE_MAPPINGS = Map.ofEntries(
+            entry(byte.class, Byte.class),
+            entry(short.class, Short.class),
+            entry(int.class, Integer.class),
+            entry(long.class, Long.class),
+            entry(double.class, Double.class),
+            entry(float.class, Float.class),
+            entry(boolean.class, Boolean.class),
+            entry(char.class, Character.class)
+    );
+
+    private static final Map<Class<?>, OptionType> OPTION_TYPE_MAPPINGS = Map.ofEntries(
+            entry(Byte.class, OptionType.STRING),
+            entry(Short.class, OptionType.STRING),
+            entry(Integer.class, OptionType.INTEGER),
+            entry(Long.class, OptionType.NUMBER),
+            entry(Double.class, OptionType.NUMBER),
+            entry(Float.class, OptionType.NUMBER),
+            entry(Boolean.class, OptionType.BOOLEAN),
+            entry(Character.class, OptionType.STRING),
+            entry(String.class, OptionType.STRING),
+            entry(String[].class, OptionType.STRING),
+            entry(User.class, OptionType.USER),
+            entry(Member.class, OptionType.USER),
+            entry(GuildChannel.class, OptionType.CHANNEL),
+            entry(GuildMessageChannel.class, OptionType.CHANNEL),
+            entry(ThreadChannel.class, OptionType.CHANNEL),
+            entry(TextChannel.class, OptionType.CHANNEL),
+            entry(NewsChannel.class, OptionType.CHANNEL),
+            entry(AudioChannel.class, OptionType.CHANNEL),
+            entry(VoiceChannel.class, OptionType.CHANNEL),
+            entry(StageChannel.class, OptionType.CHANNEL),
+            entry(Role.class, OptionType.ROLE)
+    );
+
+    private static final Map<Class<?>, List<ChannelType>> CHANNEL_TYPE_RESTRICTIONS = Map.ofEntries(
+            entry(GuildMessageChannel.class, Collections.singletonList(ChannelType.TEXT)),
+            entry(TextChannel.class, Collections.singletonList(ChannelType.TEXT)),
+            entry(NewsChannel.class, Collections.singletonList(ChannelType.NEWS)),
+            entry(AudioChannel.class, Collections.singletonList(ChannelType.VOICE)),
+            entry(VoiceChannel.class, Collections.singletonList(ChannelType.VOICE)),
+            entry(StageChannel.class, Collections.singletonList(ChannelType.STAGE)),
+            entry(ThreadChannel.class, Arrays.asList(
                     ChannelType.GUILD_NEWS_THREAD,
                     ChannelType.GUILD_PUBLIC_THREAD,
                     ChannelType.GUILD_PRIVATE_THREAD
-            ));
-            put(TextChannel.class, Collections.singletonList(ChannelType.TEXT));
-            put(NewsChannel.class, Collections.singletonList(ChannelType.NEWS));
-            put(AudioChannel.class, Collections.singletonList(ChannelType.VOICE));
-            put(VoiceChannel.class, Collections.singletonList(ChannelType.VOICE));
-            put(StageChannel.class, Collections.singletonList(ChannelType.STAGE));
-        }
-    };
-
-    private final Class<?> type;
-    private final boolean isOptional;
-    private final String defaultValue;
-    private final boolean isPrimitive;
-    private final String name;
-    private final String description;
-    private final List<Choice> choices;
-    private final List<ConstraintDefinition> constraints;
-
-    private ParameterDefinition(@NotNull Class<?> type,
-                                boolean isOptional,
-                                @Nullable String defaultValue,
-                                boolean isPrimitive,
-                                @NotNull String name,
-                                @NotNull String description,
-                                @NotNull List<Choice> choices,
-                                @NotNull List<ConstraintDefinition> constraints) {
-        this.type = type;
-        this.isOptional = isOptional;
-        this.defaultValue = defaultValue;
-        this.isPrimitive = isPrimitive;
-        this.name = name;
-        this.description = description;
-        this.choices = choices;
-        this.constraints = constraints;
-    }
+            ))
+    );
 
     /**
      * Builds a new ParameterDefinition.
@@ -235,104 +212,15 @@ public OptionData toOptionData(boolean isAutoComplete) {
         }
 
         constraints.stream().filter(constraint ->
-                constraint.getAnnotation() instanceof Min
-        ).findFirst().ifPresent(constraint -> optionData.setMinValue(((Min) constraint.getAnnotation()).value()));
+                constraint.annotation() instanceof Min
+        ).findFirst().ifPresent(constraint -> optionData.setMinValue(((Min) constraint.annotation()).value()));
 
         constraints.stream().filter(constraint ->
-                constraint.getAnnotation() instanceof Max
-        ).findFirst().ifPresent(constraint -> optionData.setMaxValue(((Max) constraint.getAnnotation()).value()));
+                constraint.annotation() instanceof Max
+        ).findFirst().ifPresent(constraint -> optionData.setMaxValue(((Max) constraint.annotation()).value()));
 
         java.util.Optional.ofNullable(CHANNEL_TYPE_RESTRICTIONS.get(type)).ifPresent(optionData::setChannelTypes);
 
         return optionData;
     }
-
-    /**
-     * Gets the type of the parameter.
-     *
-     * @return the type of the parameter
-     */
-    @NotNull
-    public Class<?> getType() {
-        return type;
-    }
-
-    /**
-     * Whether the parameter is optional.
-     *
-     * @return {@code true} if the parameter is optional
-     */
-    public boolean isOptional() {
-        return isOptional;
-    }
-
-    /**
-     * Gets a possibly-null default value to use if the parameter is optional.
-     *
-     * @return a possibly-null default value
-     */
-    @Nullable
-    public String getDefaultValue() {
-        return defaultValue;
-    }
-
-    /**
-     * Whether the type of the parameter is a primitive.
-     *
-     * @return {@code true} if the type of the parameter is a primitive
-     */
-    public boolean isPrimitive() {
-        return isPrimitive;
-    }
-
-    /**
-     * Gets a possibly-empty list of {@link ConstraintDefinition ConstraintDefinitions}.
-     *
-     * @return a possibly-empty list of {@link ConstraintDefinition ConstraintDefinitions}
-     */
-    @NotNull
-    public List<ConstraintDefinition> getConstraints() {
-        return constraints;
-    }
-
-    /**
-     * Gets the parameter name.
-     *
-     * @return the parameter name
-     */
-    @NotNull
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * Gets the parameter description. Only used for slash commands.
-     *
-     * @return the parameter description
-     */
-    @NotNull
-    public String getDescription() {
-        return description;
-    }
-
-    /**
-     * Gets the parameter choices. Only used for slash commands.
-     *
-     * @return the parameter choices
-     */
-    public List<Choice> getChoices() {
-        return choices;
-    }
-
-    @Override
-    public String toString() {
-        return "{" +
-                type.getName() +
-                ", isOptional=" + isOptional +
-                ", defaultValue='" + defaultValue + '\'' +
-                ", isPrimitive=" + isPrimitive +
-                ", name='" + name + '\'' +
-                ", constraints=" + constraints +
-                '}';
-    }
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/reflect/TextInputDefinition.java b/src/main/java/com/github/kaktushose/jda/commands/reflect/TextInputDefinition.java
index 386024e7f..d3260b7dd 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/reflect/TextInputDefinition.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/reflect/TextInputDefinition.java
@@ -16,31 +16,15 @@
  * @see com.github.kaktushose.jda.commands.annotations.interactions.Modal Modal
  * @since 4.0.0
  */
-public class TextInputDefinition {
-
-    private final String label;
-    private final String placeholder;
-    private final String defaultValue;
-    private final int minValue;
-    private final int maxValue;
-    private final TextInputStyle style;
-    private final boolean required;
-
-    private TextInputDefinition(String label,
-                                String placeholder,
-                                String defaultValue,
-                                int minValue,
-                                int maxValue,
-                                TextInputStyle style,
-                                boolean required) {
-        this.label = label;
-        this.placeholder = placeholder;
-        this.defaultValue = defaultValue;
-        this.minValue = minValue;
-        this.maxValue = maxValue;
-        this.style = style;
-        this.required = required;
-    }
+public record TextInputDefinition(
+        String label,
+        String placeholder,
+        String defaultValue,
+        int minValue,
+        int maxValue,
+        TextInputStyle style,
+        boolean required
+) {
 
     /**
      * Builds a new TextInputDefinition.
@@ -94,71 +78,4 @@ public net.dv8tion.jda.api.interactions.components.text.TextInput toTextInput()
 
         return textInput.build();
     }
-
-    /**
-     * Gets the label of the TextInput.
-     *
-     * @return the label of the TextInput
-     */
-    public String getLabel() {
-        return label;
-    }
-
-    /**
-     * Gets the placeholder of the TextInput.
-     *
-     * @return the placeholder of the TextInput
-     */
-    public String getPlaceholder() {
-        return placeholder;
-    }
-
-    /**
-     * Gets the minimum value of the TextInput.
-     *
-     * @return the minimum value of the TextInput
-     */
-    public int getMinValue() {
-        return minValue;
-    }
-
-    /**
-     * Gets the maximum value of the TextInput.
-     *
-     * @return the maximum value of the TextInput
-     */
-    public int getMaxValue() {
-        return maxValue;
-    }
-
-    /**
-     * Gets the {@link TextInputStyle} of the TextInput.
-     *
-     * @return the {@link TextInputStyle} of the TextInput
-     */
-    public TextInputStyle getStyle() {
-        return style;
-    }
-
-    /**
-     * Whether this TextInput is required.
-     *
-     * @return {@code true} if this TextInput is required
-     */
-    public boolean isRequired() {
-        return required;
-    }
-
-    @Override
-    public String toString() {
-        return "TextInputDefinition{" +
-                "label='" + label + '\'' +
-                ", placeholder='" + placeholder + '\'' +
-                ", defaultValue='" + defaultValue + '\'' +
-                ", minValue=" + minValue +
-                ", maxValue=" + maxValue +
-                ", style=" + style +
-                ", required=" + required +
-                '}';
-    }
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/AutoCompleteDefinition.java b/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/AutoCompleteDefinition.java
index 74a998128..6566bcdc9 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/AutoCompleteDefinition.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/AutoCompleteDefinition.java
@@ -1,5 +1,6 @@
 package com.github.kaktushose.jda.commands.reflect.interactions;
 
+import com.github.kaktushose.jda.commands.Helpers;
 import com.github.kaktushose.jda.commands.annotations.interactions.AutoComplete;
 import com.github.kaktushose.jda.commands.annotations.interactions.Interaction;
 import com.github.kaktushose.jda.commands.dispatching.interactions.autocomplete.AutoCompleteEvent;
@@ -7,7 +8,6 @@
 
 import java.lang.reflect.Method;
 import java.util.HashSet;
-import java.util.List;
 import java.util.Optional;
 import java.util.Set;
 
@@ -17,11 +17,11 @@
  * @see AutoComplete
  * @since 4.0.0
  */
-public class AutoCompleteDefinition extends GenericInteractionDefinition {
+public final class AutoCompleteDefinition extends GenericInteractionDefinition {
 
-    private Set<String> commands;
+    private final Set<String> commands;
 
-    protected AutoCompleteDefinition(Method method, Set<String> commands) {
+    private AutoCompleteDefinition(Method method, Set<String> commands) {
         super(method, new HashSet<>());
         this.commands = commands;
     }
@@ -32,39 +32,22 @@ protected AutoCompleteDefinition(Method method, Set<String> commands) {
      * @param method the {@link Method} of the AutoComplete
      * @return an {@link Optional} holding the AutoCompleteDefinition
      */
-    public static Optional<AutoCompleteDefinition> build(@NotNull Method method, List<String> autoCompletes) {
+    public static Optional<AutoCompleteDefinition> build(@NotNull Method method) {
         if (!method.isAnnotationPresent(AutoComplete.class) || !method.getDeclaringClass().isAnnotationPresent(Interaction.class)) {
             return Optional.empty();
         }
 
-        if (method.getParameters().length != 1) {
-            log.error("An error has occurred! Skipping auto complete {}.{}:",
-                    method.getDeclaringClass().getSimpleName(),
-                    method.getName(),
-                    new IllegalArgumentException("Invalid amount of parameters!"));
+        if (Helpers.isIncorrectParameterAmount(method, 1)) {
             return Optional.empty();
         }
 
-        if (!AutoCompleteEvent.class.isAssignableFrom(method.getParameters()[0].getType())) {
-            log.error("An error has occurred! Skipping auto complete {}.{}:",
-                    method.getDeclaringClass().getSimpleName(),
-                    method.getName(),
-                    new IllegalArgumentException(String.format("First parameter must be of type %s", AutoCompleteEvent.class.getSimpleName())));
+        if (Helpers.isIncorrectParameterType(method, 0, AutoCompleteEvent.class)) {
             return Optional.empty();
         }
 
         AutoComplete autoComplete = method.getAnnotation(AutoComplete.class);
         Set<String> values = Set.of(autoComplete.value());
 
-        if (autoCompletes.stream().anyMatch(values::contains)) {
-            log.error("An error has occurred! Skipping auto complete {}.{}:",
-                    method.getDeclaringClass().getSimpleName(),
-                    method.getName(),
-                    new IllegalStateException(String.format("There is already an auto complete handler registered " +
-                            "for at least one of the following commands: %s", values)));
-            return Optional.empty();
-        }
-
         return Optional.of(new AutoCompleteDefinition(method, values));
     }
 
@@ -77,21 +60,12 @@ public Set<String> getCommandNames() {
         return commands;
     }
 
-    /**
-     * Set the command names this AutoComplete can handle
-     *
-     * @param commands a set of command names
-     */
-    public void setCommandNames(Set<String> commands) {
-        this.commands = commands;
-    }
-
     @Override
     public String toString() {
         return "AutoCompleteDefinition{" +
-               "commands=" + commands +
-               ", id='" + definitionId + "'" +
-               ", method=" + method +
-               '}';
+                "commands=" + commands +
+                ", id='" + definitionId + "'" +
+                ", method=" + method +
+                '}';
     }
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/EphemeralInteractionDefinition.java b/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/EphemeralInteractionDefinition.java
index 4e802ed15..0b26b1541 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/EphemeralInteractionDefinition.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/EphemeralInteractionDefinition.java
@@ -1,5 +1,8 @@
 package com.github.kaktushose.jda.commands.reflect.interactions;
 
+import com.github.kaktushose.jda.commands.reflect.interactions.commands.GenericCommandDefinition;
+import com.github.kaktushose.jda.commands.reflect.interactions.components.GenericComponentDefinition;
+
 import java.lang.reflect.Method;
 import java.util.Set;
 
@@ -8,7 +11,7 @@
  *
  * @since 4.0.0
  */
-public abstract class EphemeralInteractionDefinition extends GenericInteractionDefinition {
+public abstract sealed class EphemeralInteractionDefinition extends GenericInteractionDefinition permits ModalDefinition, GenericCommandDefinition, GenericComponentDefinition {
 
     protected boolean ephemeral;
 
diff --git a/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/GenericInteractionDefinition.java b/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/GenericInteractionDefinition.java
index f5454f78d..8f5d411be 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/GenericInteractionDefinition.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/GenericInteractionDefinition.java
@@ -13,7 +13,7 @@
  *
  * @since 4.0.0
  */
-public abstract class GenericInteractionDefinition {
+public sealed abstract class GenericInteractionDefinition permits AutoCompleteDefinition, EphemeralInteractionDefinition {
 
     protected static final Logger log = LoggerFactory.getLogger(GenericInteractionDefinition.class);
 
diff --git a/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/ModalDefinition.java b/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/ModalDefinition.java
index 6db693c88..05b486136 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/ModalDefinition.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/ModalDefinition.java
@@ -1,5 +1,6 @@
 package com.github.kaktushose.jda.commands.reflect.interactions;
 
+import com.github.kaktushose.jda.commands.Helpers;
 import com.github.kaktushose.jda.commands.annotations.interactions.Interaction;
 import com.github.kaktushose.jda.commands.annotations.interactions.Modal;
 import com.github.kaktushose.jda.commands.annotations.interactions.Permissions;
@@ -18,12 +19,12 @@
  * @see Modal
  * @since 4.0.0
  */
-public class ModalDefinition extends EphemeralInteractionDefinition implements CustomId {
+public final class ModalDefinition extends EphemeralInteractionDefinition implements CustomId {
 
     private final String title;
     private final List<TextInputDefinition> textInputs;
 
-    protected ModalDefinition(Method method, Set<String> permissions, boolean ephemeral, String title, List<TextInputDefinition> textInputs) {
+    private ModalDefinition(Method method, Set<String> permissions, boolean ephemeral, String title, List<TextInputDefinition> textInputs) {
         super(method, permissions, ephemeral);
         this.title = title;
         this.textInputs = textInputs;
@@ -45,15 +46,11 @@ public static Optional<ModalDefinition> build(@NotNull Method method) {
             log.error("An error has occurred! Skipping Modal {}.{}:",
                     method.getDeclaringClass().getSimpleName(),
                     method.getName(),
-                    new IllegalArgumentException("Invalid amount of parameters!"));
+                    new IllegalArgumentException("Invalid amount of parameters! Modals need between 1 and 5 TextInputs"));
             return Optional.empty();
         }
 
-        if (!ModalEvent.class.isAssignableFrom(method.getParameters()[0].getType())) {
-            log.error("An error has occurred! Skipping Modal {}.{}:",
-                    method.getDeclaringClass().getSimpleName(),
-                    method.getName(),
-                    new IllegalArgumentException(String.format("First parameter must be of type %s!", ModalEvent.class.getSimpleName())));
+        if (Helpers.isIncorrectParameterType(method, 0, ModalEvent.class)) {
             return Optional.empty();
         }
 
@@ -134,12 +131,12 @@ public String createCustomId(String runtimeId) {
     @Override
     public String toString() {
         return "ModalDefinition{" +
-               "title='" + title + '\'' +
-               ", textInputs=" + textInputs +
-               ", ephemeral=" + ephemeral +
-               ", id='" + definitionId + '\'' +
-               ", method=" + method +
-               ", permissions=" + permissions +
-               '}';
+                "title='" + title + '\'' +
+                ", textInputs=" + textInputs +
+                ", ephemeral=" + ephemeral +
+                ", id='" + definitionId + '\'' +
+                ", method=" + method +
+                ", permissions=" + permissions +
+                '}';
     }
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/commands/ContextCommandDefinition.java b/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/commands/ContextCommandDefinition.java
index e92dee003..fe7a41ce6 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/commands/ContextCommandDefinition.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/commands/ContextCommandDefinition.java
@@ -1,9 +1,10 @@
 package com.github.kaktushose.jda.commands.reflect.interactions.commands;
 
+import com.github.kaktushose.jda.commands.Helpers;
 import com.github.kaktushose.jda.commands.annotations.interactions.ContextCommand;
 import com.github.kaktushose.jda.commands.annotations.interactions.Interaction;
-import com.github.kaktushose.jda.commands.annotations.interactions.Permissions;
 import com.github.kaktushose.jda.commands.annotations.interactions.SlashCommand;
+import com.github.kaktushose.jda.commands.reflect.MethodBuildContext;
 import net.dv8tion.jda.api.Permission;
 import net.dv8tion.jda.api.interactions.commands.Command;
 import net.dv8tion.jda.api.interactions.commands.DefaultMemberPermissions;
@@ -14,7 +15,6 @@
 
 import java.lang.reflect.Method;
 import java.util.Arrays;
-import java.util.HashSet;
 import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
@@ -25,7 +25,7 @@
  * @see ContextCommand
  * @since 4.0.0
  */
-public class ContextCommandDefinition extends GenericCommandDefinition {
+public final class ContextCommandDefinition extends GenericCommandDefinition {
 
     public ContextCommandDefinition(Method method,
                                     boolean ephemeral,
@@ -40,24 +40,14 @@ public ContextCommandDefinition(Method method,
         super(method, ephemeral, name, permissions, isGuildOnly, isNSFW, commandType, enabledPermissions, scope, localizationFunction);
     }
 
-    public static Optional<ContextCommandDefinition> build(@NotNull Method method, @NotNull LocalizationFunction localizationFunction) {
+    public static Optional<ContextCommandDefinition> build(@NotNull MethodBuildContext context) {
+        Method method = context.method();
         if (!method.isAnnotationPresent(ContextCommand.class) || !method.getDeclaringClass().isAnnotationPresent(Interaction.class)) {
             return Optional.empty();
         }
 
         ContextCommand command = method.getAnnotation(ContextCommand.class);
 
-        if (!command.isActive()) {
-            log.debug("Command {} is set inactive. Skipping this command!", method.getName());
-            return Optional.empty();
-        }
-
-        Set<String> permissions = new HashSet<>();
-        if (method.isAnnotationPresent(Permissions.class)) {
-            Permissions permission = method.getAnnotation(Permissions.class);
-            permissions = new HashSet<>(Arrays.asList(permission.value()));
-        }
-
         Set<net.dv8tion.jda.api.Permission> enabledFor = Arrays.stream(command.enabledFor()).collect(Collectors.toSet());
         if (enabledFor.size() == 1 && enabledFor.contains(net.dv8tion.jda.api.Permission.UNKNOWN)) {
             enabledFor.clear();
@@ -65,15 +55,15 @@ public static Optional<ContextCommandDefinition> build(@NotNull Method method, @
 
         return Optional.of(new ContextCommandDefinition(
                 method,
-                command.ephemeral(),
+                Helpers.ephemeral(context, command.ephemeral()),
                 command.value(),
-                permissions,
+                Helpers.permissions(context),
                 command.isGuildOnly(),
                 command.isNSFW(),
                 command.type(),
                 enabledFor,
                 command.scope(),
-                localizationFunction
+                context.localizationFunction()
         ));
     }
 
@@ -90,17 +80,17 @@ public CommandData toCommandData() {
     @Override
     public String toString() {
         return "ContextCommandDefinition{" +
-               "id='" + definitionId + '\'' +
-               ", method=" + method +
-               ", name='" + name + '\'' +
-               ", permissions=" + permissions +
-               ", isGuildOnly=" + isGuildOnly +
-               ", isNSFW=" + isNSFW +
-               ", commandType=" + commandType +
-               ", enabledPermissions=" + enabledPermissions +
-               ", scope=" + scope +
-               ", localizationFunction=" + localizationFunction +
-               ", ephemeral=" + ephemeral +
-               '}';
+                "id='" + definitionId + '\'' +
+                ", method=" + method +
+                ", name='" + name + '\'' +
+                ", permissions=" + permissions +
+                ", isGuildOnly=" + isGuildOnly +
+                ", isNSFW=" + isNSFW +
+                ", commandType=" + commandType +
+                ", enabledPermissions=" + enabledPermissions +
+                ", scope=" + scope +
+                ", localizationFunction=" + localizationFunction +
+                ", ephemeral=" + ephemeral +
+                '}';
     }
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/commands/GenericCommandDefinition.java b/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/commands/GenericCommandDefinition.java
index 402d8ea72..2345e04e5 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/commands/GenericCommandDefinition.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/commands/GenericCommandDefinition.java
@@ -18,7 +18,7 @@
  * @see ContextCommandDefinition
  * @since 4.0.0
  */
-public abstract class GenericCommandDefinition extends EphemeralInteractionDefinition implements Comparable<GenericCommandDefinition> {
+public abstract sealed class GenericCommandDefinition extends EphemeralInteractionDefinition implements Comparable<GenericCommandDefinition> permits ContextCommandDefinition, SlashCommandDefinition {
 
     protected final String name;
     protected final boolean isGuildOnly;
@@ -120,18 +120,18 @@ public SlashCommand.CommandScope getCommandScope() {
     @Override
     public String toString() {
         return "GenericCommandDefinition{" +
-               "id='" + definitionId + '\'' +
-               ", method=" + method +
-               ", name='" + name + '\'' +
-               ", permissions=" + permissions +
-               ", isGuildOnly=" + isGuildOnly +
-               ", isNSFW=" + isNSFW +
-               ", commandType=" + commandType +
-               ", enabledPermissions=" + enabledPermissions +
-               ", scope=" + scope +
-               ", localizationFunction=" + localizationFunction +
-               ", ephemeral=" + ephemeral +
-               '}';
+                "id='" + definitionId + '\'' +
+                ", method=" + method +
+                ", name='" + name + '\'' +
+                ", permissions=" + permissions +
+                ", isGuildOnly=" + isGuildOnly +
+                ", isNSFW=" + isNSFW +
+                ", commandType=" + commandType +
+                ", enabledPermissions=" + enabledPermissions +
+                ", scope=" + scope +
+                ", localizationFunction=" + localizationFunction +
+                ", ephemeral=" + ephemeral +
+                '}';
     }
 
     @Override
diff --git a/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/commands/SlashCommandDefinition.java b/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/commands/SlashCommandDefinition.java
index beead7442..35f04a035 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/commands/SlashCommandDefinition.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/commands/SlashCommandDefinition.java
@@ -1,13 +1,14 @@
 package com.github.kaktushose.jda.commands.reflect.interactions.commands;
 
+import com.github.kaktushose.jda.commands.Helpers;
 import com.github.kaktushose.jda.commands.annotations.interactions.Cooldown;
 import com.github.kaktushose.jda.commands.annotations.interactions.Interaction;
-import com.github.kaktushose.jda.commands.annotations.interactions.Permissions;
 import com.github.kaktushose.jda.commands.annotations.interactions.SlashCommand;
 import com.github.kaktushose.jda.commands.dispatching.interactions.commands.CommandEvent;
-import com.github.kaktushose.jda.commands.dispatching.validation.ValidatorRegistry;
 import com.github.kaktushose.jda.commands.reflect.CooldownDefinition;
+import com.github.kaktushose.jda.commands.reflect.MethodBuildContext;
 import com.github.kaktushose.jda.commands.reflect.ParameterDefinition;
+import com.github.kaktushose.jda.commands.reflect.interactions.AutoCompleteDefinition;
 import net.dv8tion.jda.api.Permission;
 import net.dv8tion.jda.api.interactions.commands.Command;
 import net.dv8tion.jda.api.interactions.commands.DefaultMemberPermissions;
@@ -15,12 +16,9 @@
 import net.dv8tion.jda.api.interactions.commands.build.SlashCommandData;
 import net.dv8tion.jda.api.interactions.commands.build.SubcommandData;
 import net.dv8tion.jda.api.interactions.commands.localization.LocalizationFunction;
-import org.jetbrains.annotations.NotNull;
 
 import java.lang.reflect.Method;
-import java.lang.reflect.Parameter;
 import java.util.*;
-import java.util.stream.Collectors;
 
 /**
  * Representation of a slash command.
@@ -28,12 +26,12 @@
  * @see SlashCommand
  * @since 2.0.0
  */
-public class SlashCommandDefinition extends GenericCommandDefinition {
+public final class SlashCommandDefinition extends GenericCommandDefinition {
 
     private final String description;
     private final List<ParameterDefinition> parameters;
     private final CooldownDefinition cooldown;
-    private boolean isAutoComplete;
+    private final boolean isAutoComplete;
 
     public SlashCommandDefinition(Method method,
                                   boolean ephemeral,
@@ -59,15 +57,10 @@ public SlashCommandDefinition(Method method,
     /**
      * Builds a new CommandDefinition.
      *
-     * @param method               the {@link Method} of the command
-     * @param validatorRegistry    the corresponding {@link ValidatorRegistry}
-     * @param localizationFunction the {@link LocalizationFunction} to use
      * @return an {@link Optional} holding the CommandDefinition
      */
-    public static Optional<SlashCommandDefinition> build(@NotNull Method method,
-                                                         @NotNull ValidatorRegistry validatorRegistry,
-                                                         @NotNull LocalizationFunction localizationFunction) {
-
+    public static Optional<SlashCommandDefinition> build(MethodBuildContext context) {
+        Method method = context.method();
         if (!method.isAnnotationPresent(SlashCommand.class) || !method.getDeclaringClass().isAnnotationPresent(Interaction.class)) {
             return Optional.empty();
         }
@@ -75,33 +68,19 @@ public static Optional<SlashCommandDefinition> build(@NotNull Method method,
         SlashCommand command = method.getAnnotation(SlashCommand.class);
         Interaction interaction = method.getDeclaringClass().getAnnotation(Interaction.class);
 
-        if (!command.isActive()) {
-            log.debug("Command {} is set inactive. Skipping this command!", method.getName());
-            return Optional.empty();
-        }
-
-        Set<String> permissions = new HashSet<>();
-        if (method.isAnnotationPresent(Permissions.class)) {
-            Permissions permission = method.getAnnotation(Permissions.class);
-            permissions = new HashSet<>(Arrays.asList(permission.value()));
-        }
+        String name = String.join(" ", interaction.value(), command.value())
+                .replaceAll(" +", " ")
+                .trim();
 
-        String label = interaction.value() + " " + command.value();
-        while (label.contains("  ")) {
-            label = label.replaceAll(" {2}", " ");
-        }
-        label = label.trim();
-
-        if (label.isEmpty()) {
+        if (name.isEmpty()) {
             logError("Labels must not be empty!", method);
             return Optional.empty();
         }
 
         // build parameter definitions
-        List<ParameterDefinition> parameters = new ArrayList<>();
-        for (Parameter parameter : method.getParameters()) {
-            parameters.add(ParameterDefinition.build(parameter, validatorRegistry));
-        }
+        List<ParameterDefinition> parameters = Arrays.stream(method.getParameters())
+                .map(parameter -> ParameterDefinition.build(parameter, context.validatorRegistry()))
+                .toList();
 
         if (parameters.isEmpty()) {
             logError(String.format("First parameter must be of type %s!", CommandEvent.class.getSimpleName()), method);
@@ -109,12 +88,11 @@ public static Optional<SlashCommandDefinition> build(@NotNull Method method,
         }
 
         // validate parameter definitions
-        for (int i = 0; i < parameters.size(); i++) {
-            ParameterDefinition parameter = parameters.get(i);
-            Class<?> type = parameter.getType();
+        for (ParameterDefinition parameter : parameters) {
+            Class<?> type = parameter.type();
 
             // first argument must be a CommandEvent
-            if (i == 0) {
+            if (parameter == parameters.getFirst()) {
                 if (!CommandEvent.class.isAssignableFrom(type)) {
                     logError(String.format("First parameter must be of type %s!", CommandEvent.class.getSimpleName()), method);
                     return Optional.empty();
@@ -130,26 +108,34 @@ public static Optional<SlashCommandDefinition> build(@NotNull Method method,
             }
         }
 
-        Set<net.dv8tion.jda.api.Permission> enabledFor = Arrays.stream(command.enabledFor()).collect(Collectors.toSet());
-        if (enabledFor.size() == 1 && enabledFor.contains(net.dv8tion.jda.api.Permission.UNKNOWN)) {
-            enabledFor.clear();
+        Set<Permission> enabledFor = Set.of(command.enabledFor());
+        if (enabledFor.size() == 1 && enabledFor.contains(Permission.UNKNOWN)) {
+            enabledFor = Set.of();
+        }
+
+        CooldownDefinition cooldownDefinition = CooldownDefinition.build(method.getAnnotation(Cooldown.class));
+        if (cooldownDefinition.delay() == 0 && context.cooldownDefinition() != null) {
+            cooldownDefinition = context.cooldownDefinition();
         }
 
         return Optional.of(new SlashCommandDefinition(
                 method,
-                command.ephemeral(),
-                label,
-                permissions,
+                Helpers.ephemeral(context, command.ephemeral()),
+                name,
+                Helpers.permissions(context),
                 command.isGuildOnly(),
                 command.isNSFW(),
                 Command.Type.SLASH,
                 enabledFor,
                 command.scope(),
-                localizationFunction,
+                context.localizationFunction(),
                 command.desc(),
                 parameters,
-                CooldownDefinition.build(method.getAnnotation(Cooldown.class)),
-                false
+                cooldownDefinition,
+                context.autoCompleteDefinitions().stream()
+                        .map(AutoCompleteDefinition::getCommandNames)
+                        .flatMap(Collection::stream)
+                        .anyMatch(name::startsWith)
         ));
     }
 
@@ -176,7 +162,7 @@ public SlashCommandData toCommandData() {
                 .setLocalizationFunction(localizationFunction)
                 .setDefaultPermissions(DefaultMemberPermissions.enabledFor(enabledPermissions));
         parameters.forEach(parameter -> {
-            if (CommandEvent.class.isAssignableFrom(parameter.getType())) {
+            if (CommandEvent.class.isAssignableFrom(parameter.type())) {
                 return;
             }
             command.addOptions(parameter.toOptionData(isAutoComplete));
@@ -197,7 +183,7 @@ public SubcommandData toSubCommandData(String label) {
 
         );
         parameters.forEach(parameter -> {
-            if (CommandEvent.class.isAssignableFrom(parameter.getType())) {
+            if (CommandEvent.class.isAssignableFrom(parameter.type())) {
                 return;
             }
             command.addOptions(parameter.toOptionData(isAutoComplete));
@@ -244,12 +230,12 @@ public CooldownDefinition getCooldown() {
     }
 
     /**
-     * Whether this command has a cooldown. More formally, checks if {@link CooldownDefinition#getDelay()} > 0.
+     * Whether this command has a cooldown. More formally, checks if {@link CooldownDefinition#delay()} > 0.
      *
      * @return {@code true} if this command has a cooldown.
      */
     public boolean hasCooldown() {
-        return getCooldown().getDelay() > 0;
+        return getCooldown().delay() > 0;
     }
 
     /**
@@ -261,35 +247,24 @@ public boolean isAutoComplete() {
         return isAutoComplete;
     }
 
-    /**
-     * Whether this command supports auto complete.
-     *
-     * @param autoComplete whether this can command support auto complete
-     * @return this instance for fluent interface
-     */
-    public SlashCommandDefinition setAutoComplete(boolean autoComplete) {
-        this.isAutoComplete = autoComplete;
-        return this;
-    }
-
     @Override
     public String toString() {
         return "SlashCommandDefinition{" +
-               "id='" + definitionId + '\'' +
-               ", method=" + method +
-               ", name='" + name + '\'' +
-               ", description='" + description + '\'' +
-               ", parameters=" + parameters +
-               ", cooldown=" + cooldown +
-               ", isAutoComplete=" + isAutoComplete +
-               ", permissions=" + permissions +
-               ", isGuildOnly=" + isGuildOnly +
-               ", isNSFW=" + isNSFW +
-               ", commandType=" + commandType +
-               ", enabledPermissions=" + enabledPermissions +
-               ", scope=" + scope +
-               ", localizationFunction=" + localizationFunction +
-               ", ephemeral=" + ephemeral +
-               '}';
+                "id='" + definitionId + '\'' +
+                ", method=" + method +
+                ", name='" + name + '\'' +
+                ", description='" + description + '\'' +
+                ", parameters=" + parameters +
+                ", cooldown=" + cooldown +
+                ", isAutoComplete=" + isAutoComplete +
+                ", permissions=" + permissions +
+                ", isGuildOnly=" + isGuildOnly +
+                ", isNSFW=" + isNSFW +
+                ", commandType=" + commandType +
+                ", enabledPermissions=" + enabledPermissions +
+                ", scope=" + scope +
+                ", localizationFunction=" + localizationFunction +
+                ", ephemeral=" + ephemeral +
+                '}';
     }
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/components/ButtonDefinition.java b/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/components/ButtonDefinition.java
index d5782da36..b5b3e2911 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/components/ButtonDefinition.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/components/ButtonDefinition.java
@@ -1,16 +1,15 @@
 package com.github.kaktushose.jda.commands.reflect.interactions.components;
 
+import com.github.kaktushose.jda.commands.Helpers;
 import com.github.kaktushose.jda.commands.annotations.interactions.Button;
 import com.github.kaktushose.jda.commands.annotations.interactions.Interaction;
-import com.github.kaktushose.jda.commands.annotations.interactions.Permissions;
 import com.github.kaktushose.jda.commands.dispatching.interactions.components.ComponentEvent;
+import com.github.kaktushose.jda.commands.reflect.MethodBuildContext;
 import net.dv8tion.jda.api.entities.emoji.Emoji;
 import net.dv8tion.jda.api.interactions.components.buttons.ButtonStyle;
 import org.jetbrains.annotations.NotNull;
 
 import java.lang.reflect.Method;
-import java.util.Arrays;
-import java.util.HashSet;
 import java.util.Optional;
 import java.util.Set;
 
@@ -20,20 +19,20 @@
  * @see Button
  * @since 2.3.0
  */
-public class ButtonDefinition extends GenericComponentDefinition {
+public final class ButtonDefinition extends GenericComponentDefinition {
 
     private final String label;
     private final Emoji emoji;
     private final String link;
     private final ButtonStyle style;
 
-    protected ButtonDefinition(Method method,
-                               Set<String> permissions,
-                               boolean ephemeral,
-                               String label,
-                               Emoji emoji,
-                               String link,
-                               ButtonStyle style) {
+    private ButtonDefinition(Method method,
+                             Set<String> permissions,
+                             boolean ephemeral,
+                             String label,
+                             Emoji emoji,
+                             String link,
+                             ButtonStyle style) {
         super(method, permissions, ephemeral);
         this.label = label;
         this.emoji = emoji;
@@ -44,38 +43,23 @@ protected ButtonDefinition(Method method,
     /**
      * Builds a new ButtonDefinition.
      *
-     * @param method the {@link Method} of the button
      * @return an {@link Optional} holding the ButtonDefinition
      */
-    public static Optional<ButtonDefinition> build(@NotNull Method method) {
+    public static Optional<ButtonDefinition> build(MethodBuildContext context) {
+        Method method = context.method();
         if (!method.isAnnotationPresent(Button.class) || !method.getDeclaringClass().isAnnotationPresent(Interaction.class)) {
             return Optional.empty();
         }
 
-        if (method.getParameters().length != 1) {
-            log.error("An error has occurred! Skipping Button {}.{}:",
-                    method.getDeclaringClass().getSimpleName(),
-                    method.getName(),
-                    new IllegalArgumentException("Invalid amount of parameters!"));
+        if (Helpers.isIncorrectParameterAmount(method, 1)) {
             return Optional.empty();
         }
 
-        if (!ComponentEvent.class.isAssignableFrom(method.getParameters()[0].getType())) {
-            log.error("An error has occurred! Skipping Button {}.{}:",
-                    method.getDeclaringClass().getSimpleName(),
-                    method.getName(),
-                    new IllegalArgumentException(String.format("First parameter must be of type %s!", ComponentEvent.class.getSimpleName())));
+        if (Helpers.isIncorrectParameterType(method, 0, ComponentEvent.class)) {
             return Optional.empty();
         }
 
         Button button = method.getAnnotation(Button.class);
-
-        Set<String> permissions = new HashSet<>();
-        if (method.isAnnotationPresent(Permissions.class)) {
-            Permissions permission = method.getAnnotation(Permissions.class);
-            permissions = new HashSet<>(Arrays.asList(permission.value()));
-        }
-
         Emoji emoji;
         String emojiString = button.emoji();
         if (emojiString.isEmpty()) {
@@ -86,8 +70,8 @@ public static Optional<ButtonDefinition> build(@NotNull Method method) {
 
         return Optional.of(new ButtonDefinition(
                 method,
-                permissions,
-                button.ephemeral(),
+                Helpers.permissions(context),
+                Helpers.ephemeral(context, button.ephemeral()),
                 button.value(),
                 emoji,
                 button.link(),
@@ -159,14 +143,14 @@ public String getDisplayName() {
     @Override
     public String toString() {
         return "ButtonDefinition{" +
-               "label='" + label + '\'' +
-               ", emoji=" + emoji +
-               ", link='" + link + '\'' +
-               ", style=" + style +
-               ", ephemeral=" + ephemeral +
-               ", permissions=" + permissions +
-               ", id='" + definitionId + '\'' +
-               ", method=" + method +
-               '}';
+                "label='" + label + '\'' +
+                ", emoji=" + emoji +
+                ", link='" + link + '\'' +
+                ", style=" + style +
+                ", ephemeral=" + ephemeral +
+                ", permissions=" + permissions +
+                ", id='" + definitionId + '\'' +
+                ", method=" + method +
+                '}';
     }
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/components/GenericComponentDefinition.java b/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/components/GenericComponentDefinition.java
index a3c177e91..a965afa70 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/components/GenericComponentDefinition.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/components/GenericComponentDefinition.java
@@ -2,6 +2,7 @@
 
 import com.github.kaktushose.jda.commands.reflect.interactions.CustomId;
 import com.github.kaktushose.jda.commands.reflect.interactions.EphemeralInteractionDefinition;
+import com.github.kaktushose.jda.commands.reflect.interactions.components.menus.GenericSelectMenuDefinition;
 
 import java.lang.reflect.Method;
 import java.util.Set;
@@ -13,7 +14,7 @@
  * @see com.github.kaktushose.jda.commands.reflect.interactions.components.menus.GenericSelectMenuDefinition GenericSelectMenuDefinition
  * @since 4.0.0
  */
-public abstract class GenericComponentDefinition extends EphemeralInteractionDefinition implements CustomId {
+public abstract sealed class GenericComponentDefinition extends EphemeralInteractionDefinition implements CustomId permits ButtonDefinition, GenericSelectMenuDefinition {
 
     protected GenericComponentDefinition(Method method, Set<String> permissions, boolean ephemeral) {
         super(method, permissions, ephemeral);
diff --git a/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/components/menus/EntitySelectMenuDefinition.java b/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/components/menus/EntitySelectMenuDefinition.java
index c95e93e0a..520c8500a 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/components/menus/EntitySelectMenuDefinition.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/components/menus/EntitySelectMenuDefinition.java
@@ -1,16 +1,19 @@
 package com.github.kaktushose.jda.commands.reflect.interactions.components.menus;
 
+import com.github.kaktushose.jda.commands.Helpers;
 import com.github.kaktushose.jda.commands.annotations.interactions.EntitySelectMenu;
 import com.github.kaktushose.jda.commands.annotations.interactions.Interaction;
-import com.github.kaktushose.jda.commands.annotations.interactions.Permissions;
 import com.github.kaktushose.jda.commands.dispatching.interactions.components.ComponentEvent;
+import com.github.kaktushose.jda.commands.reflect.MethodBuildContext;
 import net.dv8tion.jda.api.entities.channel.ChannelType;
 import net.dv8tion.jda.api.interactions.components.selections.EntitySelectMenu.DefaultValue;
 import net.dv8tion.jda.api.interactions.components.selections.EntitySelectMenu.SelectTarget;
-import org.jetbrains.annotations.NotNull;
 
 import java.lang.reflect.Method;
-import java.util.*;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
 
 /**
  * Representation of a {@link net.dv8tion.jda.api.interactions.components.selections.EntitySelectMenu EntitySelectMenu}.
@@ -18,21 +21,21 @@
  * @see EntitySelectMenu
  * @since 4.0.0
  */
-public class EntitySelectMenuDefinition extends GenericSelectMenuDefinition<net.dv8tion.jda.api.interactions.components.selections.EntitySelectMenu> {
+public final class EntitySelectMenuDefinition extends GenericSelectMenuDefinition<net.dv8tion.jda.api.interactions.components.selections.EntitySelectMenu> {
 
     private final Set<SelectTarget> selectTargets;
     private final Set<DefaultValue> defaultValues;
     private final Set<ChannelType> channelTypes;
 
-    protected EntitySelectMenuDefinition(Method method,
-                                         Set<String> permissions,
-                                         boolean ephemeral,
-                                         Set<SelectTarget> selectTargets,
-                                         Set<DefaultValue> defaultValues,
-                                         Set<ChannelType> channelTypes,
-                                         String placeholder,
-                                         int minValue,
-                                         int maxValue) {
+    private EntitySelectMenuDefinition(Method method,
+                                       Set<String> permissions,
+                                       boolean ephemeral,
+                                       Set<SelectTarget> selectTargets,
+                                       Set<DefaultValue> defaultValues,
+                                       Set<ChannelType> channelTypes,
+                                       String placeholder,
+                                       int minValue,
+                                       int maxValue) {
         super(method, permissions, ephemeral, placeholder, minValue, maxValue);
         this.selectTargets = selectTargets;
         this.defaultValues = defaultValues;
@@ -42,40 +45,23 @@ protected EntitySelectMenuDefinition(Method method,
     /**
      * Builds a new EntitySelectMenuDefinition.
      *
-     * @param method the {@link Method} of the button
      * @return an {@link Optional} holding the EntitySelectMenuDefinition
      */
-    public static Optional<EntitySelectMenuDefinition> build(@NotNull Method method) {
+    public static Optional<EntitySelectMenuDefinition> build(MethodBuildContext context) {
+        Method method = context.method();
         if (!method.isAnnotationPresent(EntitySelectMenu.class) || !method.getDeclaringClass().isAnnotationPresent(Interaction.class)) {
             return Optional.empty();
         }
 
-        if (method.getParameters().length != 2) {
-            log.error("An error has occurred! Skipping Button {}.{}:",
-                    method.getDeclaringClass().getSimpleName(),
-                    method.getName(),
-                    new IllegalArgumentException("Invalid amount of parameters!"));
+        if (Helpers.isIncorrectParameterAmount(method, 2)) {
             return Optional.empty();
         }
 
-        if (!ComponentEvent.class.isAssignableFrom(method.getParameters()[0].getType()) &&
-                !List.class.isAssignableFrom(method.getParameters()[1].getType())) {
-            log.error("An error has occurred! Skipping Button {}.{}:",
-                    method.getDeclaringClass().getSimpleName(),
-                    method.getName(),
-                    new IllegalArgumentException(String.format("First parameter must be of type %s, second parameter of type %s!",
-                            ComponentEvent.class.getSimpleName(),
-                            List.class.getSimpleName()
-                    )));
+        if (Helpers.isIncorrectParameterType(method, 0, ComponentEvent.class) ||
+                Helpers.isIncorrectParameterType(method, 1, List.class)) {
             return Optional.empty();
         }
 
-        Set<String> permissions = new HashSet<>();
-        if (method.isAnnotationPresent(Permissions.class)) {
-            Permissions permission = method.getAnnotation(Permissions.class);
-            permissions = new HashSet<>(Arrays.asList(permission.value()));
-        }
-
         EntitySelectMenu selectMenu = method.getAnnotation(EntitySelectMenu.class);
 
         Set<DefaultValue> defaultValueSet = new HashSet<>();
@@ -94,8 +80,8 @@ public static Optional<EntitySelectMenuDefinition> build(@NotNull Method method)
 
         return Optional.of(new EntitySelectMenuDefinition(
                 method,
-                permissions,
-                selectMenu.ephemeral(),
+                Helpers.permissions(context),
+                Helpers.ephemeral(context, selectMenu.ephemeral()),
                 Set.of(selectMenu.value()),
                 defaultValueSet,
                 new HashSet<>(Set.of(selectMenu.channelTypes())),
@@ -152,16 +138,16 @@ public Set<ChannelType> getChannelTypes() {
     @Override
     public String toString() {
         return "EntitySelectMenuDefinition{" +
-               "selectTargets=" + selectTargets +
-               ", defaultValues=" + defaultValues +
-               ", channelTypes=" + channelTypes +
-               ", placeholder='" + placeholder + '\'' +
-               ", minValue=" + minValue +
-               ", maxValue=" + maxValue +
-               ", permissions=" + permissions +
-               ", ephemeral=" + ephemeral +
-               ", id='" + definitionId + '\'' +
-               ", method=" + method +
-               '}';
+                "selectTargets=" + selectTargets +
+                ", defaultValues=" + defaultValues +
+                ", channelTypes=" + channelTypes +
+                ", placeholder='" + placeholder + '\'' +
+                ", minValue=" + minValue +
+                ", maxValue=" + maxValue +
+                ", permissions=" + permissions +
+                ", ephemeral=" + ephemeral +
+                ", id='" + definitionId + '\'' +
+                ", method=" + method +
+                '}';
     }
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/components/menus/GenericSelectMenuDefinition.java b/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/components/menus/GenericSelectMenuDefinition.java
index 96dc990d7..e0a638ce8 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/components/menus/GenericSelectMenuDefinition.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/components/menus/GenericSelectMenuDefinition.java
@@ -13,7 +13,7 @@
  * @see StringSelectMenuDefinition
  * @since 4.0.0
  */
-public abstract class GenericSelectMenuDefinition<T extends SelectMenu> extends GenericComponentDefinition {
+public abstract sealed class GenericSelectMenuDefinition<T extends SelectMenu> extends GenericComponentDefinition permits EntitySelectMenuDefinition, StringSelectMenuDefinition {
 
     protected final String placeholder;
     protected final int minValue;
diff --git a/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/components/menus/SelectOptionDefinition.java b/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/components/menus/SelectOptionDefinition.java
index b466307b2..d714a9874 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/components/menus/SelectOptionDefinition.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/components/menus/SelectOptionDefinition.java
@@ -3,7 +3,7 @@
 import com.github.kaktushose.jda.commands.annotations.interactions.SelectOption;
 import net.dv8tion.jda.api.entities.emoji.Emoji;
 
-import java.util.Optional;
+import javax.annotation.Nullable;
 
 /**
  * Representation of a {@link net.dv8tion.jda.api.interactions.components.selections.SelectOption SelectOption}.
@@ -11,21 +11,13 @@
  * @see SelectOption
  * @since 4.0.0
  */
-public class SelectOptionDefinition {
-
-    private final String value;
-    private final String label;
-    private final String description;
-    private final Emoji emoji;
-    private final boolean isDefault;
-
-    protected SelectOptionDefinition(String value, String label, String description, Emoji emoji, boolean isDefault) {
-        this.value = value;
-        this.label = label;
-        this.description = description;
-        this.emoji = emoji;
-        this.isDefault = isDefault;
-    }
+public record SelectOptionDefinition(
+        String value,
+        String label,
+        String description,
+        @Nullable Emoji emoji,
+        boolean isDefault
+) {
 
     /**
      * Builds a new SelectOptionDefinition.
@@ -41,6 +33,7 @@ public static SelectOptionDefinition build(SelectOption option) {
         } else {
             emoji = Emoji.fromFormatted(emojiString);
         }
+
         return new SelectOptionDefinition(option.value(), option.label(), option.description(), emoji, option.isDefault());
     }
 
@@ -49,60 +42,4 @@ public net.dv8tion.jda.api.interactions.components.selections.SelectOption toSel
                 .withDescription(description)
                 .withEmoji(emoji);
     }
-
-    /**
-     * Gets the value of the SelectOption.
-     *
-     * @return the value
-     */
-    public String getValue() {
-        return value;
-    }
-
-    /**
-     * Gets the label of the SelectOption.
-     *
-     * @return the label
-     */
-    public String getLabel() {
-        return label;
-    }
-
-    /**
-     * Gets the description of the SelectOption.
-     *
-     * @return the description
-     */
-    public String getDescription() {
-        return description;
-    }
-
-    /**
-     * Gets the {@link Emoji} of the SelectOption.
-     *
-     * @return an {@link Optional} holding the {@link Emoji}
-     */
-    public Optional<Emoji> getEmoji() {
-        return Optional.ofNullable(emoji);
-    }
-
-    /**
-     * Gets whether this SelectOption is a default option.
-     *
-     * @return {@code true} if this SelectOption is a default option
-     */
-    public boolean isDefault() {
-        return isDefault;
-    }
-
-    @Override
-    public String toString() {
-        return "SelectOptionDefinition{" +
-                "value='" + value + '\'' +
-                ", label='" + label + '\'' +
-                ", description='" + description + '\'' +
-                ", emoji=" + emoji +
-                ", isDefault=" + isDefault +
-                '}';
-    }
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/components/menus/StringSelectMenuDefinition.java b/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/components/menus/StringSelectMenuDefinition.java
index b9cca3601..e22c0c5f4 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/components/menus/StringSelectMenuDefinition.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/components/menus/StringSelectMenuDefinition.java
@@ -1,14 +1,17 @@
 package com.github.kaktushose.jda.commands.reflect.interactions.components.menus;
 
+import com.github.kaktushose.jda.commands.Helpers;
 import com.github.kaktushose.jda.commands.annotations.interactions.Interaction;
-import com.github.kaktushose.jda.commands.annotations.interactions.Permissions;
 import com.github.kaktushose.jda.commands.annotations.interactions.SelectOption;
 import com.github.kaktushose.jda.commands.annotations.interactions.StringSelectMenu;
 import com.github.kaktushose.jda.commands.dispatching.interactions.components.ComponentEvent;
-import org.jetbrains.annotations.NotNull;
+import com.github.kaktushose.jda.commands.reflect.MethodBuildContext;
 
 import java.lang.reflect.Method;
-import java.util.*;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 /**
@@ -17,17 +20,17 @@
  * @see StringSelectMenu
  * @since 4.0.0
  */
-public class StringSelectMenuDefinition extends GenericSelectMenuDefinition<net.dv8tion.jda.api.interactions.components.selections.StringSelectMenu> {
+public final class StringSelectMenuDefinition extends GenericSelectMenuDefinition<net.dv8tion.jda.api.interactions.components.selections.StringSelectMenu> {
 
     private final Set<SelectOptionDefinition> selectOptions;
 
-    protected StringSelectMenuDefinition(Method method,
-                                         Set<String> permissions,
-                                         boolean ephemeral,
-                                         Set<SelectOptionDefinition> selectOptions,
-                                         String placeholder,
-                                         int minValue,
-                                         int maxValue) {
+    private StringSelectMenuDefinition(Method method,
+                                       Set<String> permissions,
+                                       boolean ephemeral,
+                                       Set<SelectOptionDefinition> selectOptions,
+                                       String placeholder,
+                                       int minValue,
+                                       int maxValue) {
         super(method, permissions, ephemeral, placeholder, minValue, maxValue);
         this.selectOptions = selectOptions;
     }
@@ -35,40 +38,23 @@ protected StringSelectMenuDefinition(Method method,
     /**
      * Builds a new StringSelectMenuDefinition.
      *
-     * @param method the {@link Method} of the button
      * @return an {@link Optional} holding the StringSelectMenuDefinition
      */
-    public static Optional<StringSelectMenuDefinition> build(@NotNull Method method) {
+    public static Optional<StringSelectMenuDefinition> build(MethodBuildContext context) {
+        Method method = context.method();
         if (!method.isAnnotationPresent(StringSelectMenu.class) || !method.getDeclaringClass().isAnnotationPresent(Interaction.class)) {
             return Optional.empty();
         }
 
-        if (method.getParameters().length != 2) {
-            log.error("An error has occurred! Skipping Button {}.{}:",
-                    method.getDeclaringClass().getSimpleName(),
-                    method.getName(),
-                    new IllegalArgumentException("Invalid amount of parameters!"));
+        if (Helpers.isIncorrectParameterAmount(method, 2)) {
             return Optional.empty();
         }
 
-        if (!ComponentEvent.class.isAssignableFrom(method.getParameters()[0].getType()) &&
-                !List.class.isAssignableFrom(method.getParameters()[1].getType())) {
-            log.error("An error has occurred! Skipping Button {}.{}:",
-                    method.getDeclaringClass().getSimpleName(),
-                    method.getName(),
-                    new IllegalArgumentException(String.format("First parameter must be of type %s, second parameter of type %s!",
-                            ComponentEvent.class.getSimpleName(),
-                            List.class.getSimpleName()
-                    )));
+        if (Helpers.isIncorrectParameterType(method, 0, ComponentEvent.class) ||
+                Helpers.isIncorrectParameterType(method, 1, List.class)) {
             return Optional.empty();
         }
 
-        Set<String> permissions = new HashSet<>();
-        if (method.isAnnotationPresent(Permissions.class)) {
-            Permissions permission = method.getAnnotation(Permissions.class);
-            permissions = new HashSet<>(Arrays.asList(permission.value()));
-        }
-
         StringSelectMenu selectMenu = method.getAnnotation(StringSelectMenu.class);
 
         Set<SelectOptionDefinition> selectOptions = new HashSet<>();
@@ -78,8 +64,8 @@ public static Optional<StringSelectMenuDefinition> build(@NotNull Method method)
 
         return Optional.of(new StringSelectMenuDefinition(
                 method,
-                permissions,
-                selectMenu.ephemeral(),
+                Helpers.permissions(context),
+                Helpers.ephemeral(context, selectMenu.ephemeral()),
                 selectOptions,
                 selectMenu.value(),
                 selectMenu.minValue(),
@@ -113,14 +99,14 @@ public Set<SelectOptionDefinition> getSelectOptions() {
     @Override
     public String toString() {
         return "StringSelectMenuDefinition{" +
-               "selectOptions=" + selectOptions +
-               ", placeholder='" + placeholder + '\'' +
-               ", minValue=" + minValue +
-               ", maxValue=" + maxValue +
-               ", ephemeral=" + ephemeral +
-               ", permissions=" + permissions +
-               ", id='" + definitionId + '\'' +
-               ", method=" + method +
-               '}';
+                "selectOptions=" + selectOptions +
+                ", placeholder='" + placeholder + '\'' +
+                ", minValue=" + minValue +
+                ", maxValue=" + maxValue +
+                ", ephemeral=" + ephemeral +
+                ", permissions=" + permissions +
+                ", id='" + definitionId + '\'' +
+                ", method=" + method +
+                '}';
     }
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/scope/DefaultGuildScopeProvider.java b/src/main/java/com/github/kaktushose/jda/commands/scope/DefaultGuildScopeProvider.java
index 6707df8cf..d7ffab805 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/scope/DefaultGuildScopeProvider.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/scope/DefaultGuildScopeProvider.java
@@ -14,8 +14,7 @@
 public class DefaultGuildScopeProvider implements GuildScopeProvider {
 
     @Override
-    public Set<Long> getGuildsForCommand(CommandData commandData) {
+    public Set<Long> apply(CommandData commandData) {
         return Collections.emptySet();
     }
-
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/scope/GuildScopeProvider.java b/src/main/java/com/github/kaktushose/jda/commands/scope/GuildScopeProvider.java
index 9ac1daa4b..15c1cf0b1 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/scope/GuildScopeProvider.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/scope/GuildScopeProvider.java
@@ -3,6 +3,7 @@
 import net.dv8tion.jda.api.interactions.commands.build.CommandData;
 
 import java.util.Set;
+import java.util.function.Function;
 
 /**
  * Interface for declaring on which Guilds a guild scoped command should be registered.
@@ -11,7 +12,8 @@
  * @see DefaultGuildScopeProvider
  * @since 4.0.0
  */
-public interface GuildScopeProvider {
+@FunctionalInterface
+public interface GuildScopeProvider extends Function<CommandData, Set<Long>> {
 
     /**
      * Gets a Set of guild ids the provided command should be registered for.
@@ -19,6 +21,6 @@ public interface GuildScopeProvider {
      * @param commandData a copy of the {@link CommandData} to register
      * @return a Set of guild ids the provided command should be registered for
      */
-    Set<Long> getGuildsForCommand(CommandData commandData);
+    Set<Long> apply(CommandData commandData);
 
 }
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
new file mode 100644
index 000000000..33a136ec6
--- /dev/null
+++ b/src/main/java/module-info.java
@@ -0,0 +1,9 @@
+module jda.commands {
+    requires com.google.gson;
+    requires jsr305;
+    requires net.dv8tion.jda;
+    requires org.jetbrains.annotations;
+    requires org.reflections;
+    requires java.desktop;
+    requires org.slf4j;
+}
\ No newline at end of file
diff --git a/src/test/java/adapting/CustomTypeAdapter.java b/src/test/java/adapting/CustomTypeAdapter.java
index 8bee3ee15..cabfc90f5 100644
--- a/src/test/java/adapting/CustomTypeAdapter.java
+++ b/src/test/java/adapting/CustomTypeAdapter.java
@@ -9,7 +9,7 @@
 public class CustomTypeAdapter implements TypeAdapter<CustomType> {
 
     @Override
-    public Optional<CustomType> parse(@NotNull String raw, @NotNull Context context) {
+    public Optional<CustomType> apply(@NotNull String raw, @NotNull Context context) {
         return Optional.of(new CustomType());
     }
 }
diff --git a/src/test/java/adapting/TypeAdapterRegistryTest.java b/src/test/java/adapting/TypeAdapterRegistryTest.java
index de210f666..9f23c24ef 100644
--- a/src/test/java/adapting/TypeAdapterRegistryTest.java
+++ b/src/test/java/adapting/TypeAdapterRegistryTest.java
@@ -1,13 +1,19 @@
 package adapting;
 
-import adapting.mock.JDACommandsMock;
 import adapting.mock.SlashCommandInteractionEventMock;
 import adapting.mock.TypeAdapterRegistryTestController;
+import com.github.kaktushose.jda.commands.annotations.interactions.Interaction;
+import com.github.kaktushose.jda.commands.dependency.DefaultDependencyInjector;
 import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapterRegistry;
 import com.github.kaktushose.jda.commands.dispatching.adapter.impl.IntegerAdapter;
-import com.github.kaktushose.jda.commands.dispatching.interactions.commands.SlashCommandContext;
 import com.github.kaktushose.jda.commands.dispatching.interactions.commands.CommandEvent;
+import com.github.kaktushose.jda.commands.dispatching.interactions.commands.SlashCommandContext;
+import com.github.kaktushose.jda.commands.dispatching.middleware.MiddlewareRegistry;
 import com.github.kaktushose.jda.commands.dispatching.validation.ValidatorRegistry;
+import com.github.kaktushose.jda.commands.reflect.CooldownDefinition;
+import com.github.kaktushose.jda.commands.reflect.ImplementationRegistry;
+import com.github.kaktushose.jda.commands.reflect.InteractionRegistry;
+import com.github.kaktushose.jda.commands.reflect.MethodBuildContext;
 import com.github.kaktushose.jda.commands.reflect.interactions.commands.SlashCommandDefinition;
 import net.dv8tion.jda.api.interactions.commands.localization.ResourceBundleLocalizationFunction;
 import org.junit.jupiter.api.BeforeAll;
@@ -15,6 +21,7 @@
 import org.junit.jupiter.api.Test;
 
 import java.lang.reflect.Method;
+import java.util.Set;
 
 import static org.junit.jupiter.api.Assertions.*;
 
@@ -73,7 +80,7 @@ public void adapt_withStringArray_ShouldNotAdapt() throws NoSuchMethodException
 
         registry.adapt(context);
 
-        assertArrayEquals(new String[]{"a", "b", "c"}, (String[]) context.getArguments().get(1));
+        assertArrayEquals(new String[]{"a", "b", "c"}, (String[]) context.getArguments().getFirst());
     }
 
     @Test
@@ -98,7 +105,7 @@ public void adapt_withOptionalWithDefaultNull_ShouldAddNull() throws NoSuchMetho
 
         registry.adapt(context);
 
-        assertNull(context.getArguments().get(1));
+        assertNull(context.getArguments().getFirst());
     }
 
     @Test
@@ -107,7 +114,7 @@ public void adapt_withOptionalWithDefault_ShouldAddDefault() throws NoSuchMethod
 
         registry.adapt(context);
 
-        assertEquals(TypeAdapterRegistryTestController.OPTIONAL_DEFAULT, context.getArguments().get(1));
+        assertEquals(TypeAdapterRegistryTestController.OPTIONAL_DEFAULT, context.getArguments().getFirst());
     }
 
     @Test
@@ -129,15 +136,34 @@ public void adapt_withWrongArgument_ShouldCancel() throws NoSuchMethodException
 
     private SlashCommandDefinition buildCommand(String name, Class<?>... parameterTypes) throws NoSuchMethodException {
         Method method = controller.getMethod(name, parameterTypes);
-        SlashCommandDefinition command = SlashCommandDefinition.build(method, validator, ResourceBundleLocalizationFunction.empty().build()).orElse(null);
+        SlashCommandDefinition command = SlashCommandDefinition.build(new MethodBuildContext(
+                validator,
+                ResourceBundleLocalizationFunction.empty().build(),
+                controller.getAnnotation(Interaction.class),
+                Set.of(),
+                CooldownDefinition.build(null),
+                method,
+                Set.of()
+        )).orElse(null);
         assertNotNull(command);
         return command;
     }
 
-    private SlashCommandContext buildContext(SlashCommandDefinition command, String... input) {
+    public static SlashCommandContext buildContext(SlashCommandDefinition command, String... input) {
         SlashCommandContext context = new SlashCommandContext(
                 new SlashCommandInteractionEventMock(),
-                new JDACommandsMock());
+                new InteractionRegistry(
+                        new ValidatorRegistry(),
+                        new DefaultDependencyInjector(),
+                        ResourceBundleLocalizationFunction.empty().build()
+                ),
+                new ImplementationRegistry(
+                        new DefaultDependencyInjector(),
+                        new MiddlewareRegistry(),
+                        new TypeAdapterRegistry(),
+                        new ValidatorRegistry()
+                )
+        );
         context.setInput(input);
         context.setCommand(command);
         return context;
diff --git a/src/test/java/adapting/TypeAdapterTest.java b/src/test/java/adapting/TypeAdapterTest.java
index 0a07b06b9..ace397e3b 100644
--- a/src/test/java/adapting/TypeAdapterTest.java
+++ b/src/test/java/adapting/TypeAdapterTest.java
@@ -1,9 +1,8 @@
 package adapting;
 
 import adapting.mock.GuildMock;
-import adapting.mock.JDACommandsMock;
 import adapting.mock.JDAMock;
-import adapting.mock.SlashCommandInteractionEventMock;
+import com.github.kaktushose.jda.commands.Helpers;
 import com.github.kaktushose.jda.commands.dispatching.adapter.impl.*;
 import com.github.kaktushose.jda.commands.dispatching.interactions.commands.SlashCommandContext;
 import org.junit.jupiter.api.BeforeAll;
@@ -17,310 +16,308 @@ public class TypeAdapterTest {
 
     @BeforeAll
     public static void setup() {
-        context = new SlashCommandContext(new SlashCommandInteractionEventMock(), new JDACommandsMock());
+        context = TypeAdapterRegistryTest.buildContext(null, "");
     }
 
     @Test
     public void booleanAdapter_withZero_ShouldReturnFalse() {
         BooleanAdapter adapter = new BooleanAdapter();
 
-        assertFalse(adapter.parse("0", context).orElse(true));
+        assertFalse(adapter.apply("0", context).orElse(true));
     }
 
     @Test
     public void booleanAdapter_withFalse_ShouldReturnFalse() {
         BooleanAdapter adapter = new BooleanAdapter();
 
-        assertFalse(adapter.parse("False", context).orElse(true));
-        assertFalse(adapter.parse("false", context).orElse(true));
-        assertFalse(adapter.parse("fAlSe", context).orElse(true));
+        assertFalse(adapter.apply("False", context).orElse(true));
+        assertFalse(adapter.apply("false", context).orElse(true));
+        assertFalse(adapter.apply("fAlSe", context).orElse(true));
     }
 
     @Test
     public void booleanAdapter_withOne_ShouldReturnTrue() {
         BooleanAdapter adapter = new BooleanAdapter();
 
-        assertTrue(adapter.parse("1", context).orElse(false));
+        assertTrue(adapter.apply("1", context).orElse(false));
     }
 
     @Test
     public void booleanAdapter_withTrue_ShouldReturnTrue() {
         BooleanAdapter adapter = new BooleanAdapter();
 
-        assertTrue(adapter.parse("True", context).orElse(false));
-        assertTrue(adapter.parse("true", context).orElse(false));
-        assertTrue(adapter.parse("tRuE", context).orElse(false));
+        assertTrue(adapter.apply("True", context).orElse(false));
+        assertTrue(adapter.apply("true", context).orElse(false));
+        assertTrue(adapter.apply("tRuE", context).orElse(false));
     }
 
     @Test
     public void booleanAdapter_withNonBoolean_ShouldBeEmpty() {
         BooleanAdapter adapter = new BooleanAdapter();
 
-        assertFalse(adapter.parse("text", context).isPresent());
+        assertFalse(adapter.apply("text", context).isPresent());
     }
 
     @Test
     public void byteAdapter_withNumber_ShouldBePresent() {
         ByteAdapter adapter = new ByteAdapter();
 
-        assertEquals(Byte.MIN_VALUE, adapter.parse(String.valueOf(Byte.MIN_VALUE), context).orElseThrow());
-        assertEquals(Byte.MAX_VALUE, adapter.parse(String.valueOf(Byte.MAX_VALUE), context).orElseThrow());
+        assertEquals(Byte.MIN_VALUE, adapter.apply(String.valueOf(Byte.MIN_VALUE), context).orElseThrow());
+        assertEquals(Byte.MAX_VALUE, adapter.apply(String.valueOf(Byte.MAX_VALUE), context).orElseThrow());
     }
 
     @Test
     public void byteAdapter_withNonNumeric_ShouldBeEmpty() {
         ByteAdapter adapter = new ByteAdapter();
 
-        assertFalse(adapter.parse("text", context).isPresent());
+        assertFalse(adapter.apply("text", context).isPresent());
     }
 
     @Test
     public void characterAdapter_withOneChar_ShouldBePresent() {
         CharacterAdapter adapter = new CharacterAdapter();
 
-        assertTrue(adapter.parse("c", context).isPresent());
+        assertTrue(adapter.apply("c", context).isPresent());
     }
 
     @Test
     public void characterAdapter_withMultipleChars_ShouldBeEmpty() {
         CharacterAdapter adapter = new CharacterAdapter();
 
-        assertFalse(adapter.parse("chars", context).isPresent());
+        assertFalse(adapter.apply("chars", context).isPresent());
     }
 
     @Test
     public void doubleAdapter_withNumber_ShouldReturnDouble() {
         DoubleAdapter adapter = new DoubleAdapter();
 
-        assertEquals(Double.MIN_VALUE, adapter.parse(String.valueOf(Double.MIN_VALUE), context).orElseThrow());
-        assertEquals(Double.MIN_EXPONENT, adapter.parse(String.valueOf(Double.MIN_EXPONENT), context).orElseThrow());
-        assertEquals(Double.MAX_VALUE, adapter.parse(String.valueOf(Double.MAX_VALUE), context).orElseThrow());
-        assertEquals(Double.MAX_EXPONENT, adapter.parse(String.valueOf(Double.MAX_EXPONENT), context).orElseThrow());
+        assertEquals(Double.MIN_VALUE, adapter.apply(String.valueOf(Double.MIN_VALUE), context).orElseThrow());
+        assertEquals(Double.MIN_EXPONENT, adapter.apply(String.valueOf(Double.MIN_EXPONENT), context).orElseThrow());
+        assertEquals(Double.MAX_VALUE, adapter.apply(String.valueOf(Double.MAX_VALUE), context).orElseThrow());
+        assertEquals(Double.MAX_EXPONENT, adapter.apply(String.valueOf(Double.MAX_EXPONENT), context).orElseThrow());
     }
 
     @Test
     public void doubleAdapter_withNonNumeric_ShouldBeEmpty() {
         DoubleAdapter adapter = new DoubleAdapter();
 
-        assertFalse(adapter.parse("text", context).isPresent());
+        assertFalse(adapter.apply("text", context).isPresent());
     }
 
     @Test
     public void floatAdapter_withNumber_ShouldReturnDouble() {
         FloatAdapter adapter = new FloatAdapter();
 
-        assertEquals(Float.MIN_VALUE, adapter.parse(String.valueOf(Float.MIN_VALUE), context).orElseThrow());
-        assertEquals(Float.MIN_EXPONENT, adapter.parse(String.valueOf(Float.MIN_EXPONENT), context).orElseThrow());
-        assertEquals(Float.MAX_VALUE, adapter.parse(String.valueOf(Float.MAX_VALUE), context).orElseThrow());
-        assertEquals(Float.MAX_EXPONENT, adapter.parse(String.valueOf(Float.MAX_EXPONENT), context).orElseThrow());
+        assertEquals(Float.MIN_VALUE, adapter.apply(String.valueOf(Float.MIN_VALUE), context).orElseThrow());
+        assertEquals(Float.MIN_EXPONENT, adapter.apply(String.valueOf(Float.MIN_EXPONENT), context).orElseThrow());
+        assertEquals(Float.MAX_VALUE, adapter.apply(String.valueOf(Float.MAX_VALUE), context).orElseThrow());
+        assertEquals(Float.MAX_EXPONENT, adapter.apply(String.valueOf(Float.MAX_EXPONENT), context).orElseThrow());
     }
 
     @Test
     public void floatAdapter_withNonNumeric_ShouldBeEmpty() {
         FloatAdapter adapter = new FloatAdapter();
 
-        assertFalse(adapter.parse("text", context).isPresent());
+        assertFalse(adapter.apply("text", context).isPresent());
     }
 
     @Test
     public void integerAdapter_withNumber_ShouldReturnDouble() {
         IntegerAdapter adapter = new IntegerAdapter();
 
-        assertEquals(Integer.MIN_VALUE, adapter.parse(String.valueOf(Integer.MIN_VALUE), context).orElseThrow());
-        assertEquals(Integer.MAX_VALUE, adapter.parse(String.valueOf(Integer.MAX_VALUE), context).orElseThrow());
+        assertEquals(Integer.MIN_VALUE, adapter.apply(String.valueOf(Integer.MIN_VALUE), context).orElseThrow());
+        assertEquals(Integer.MAX_VALUE, adapter.apply(String.valueOf(Integer.MAX_VALUE), context).orElseThrow());
     }
 
     @Test
     public void integerAdapter_withNonNumeric_ShouldBeEmpty() {
         IntegerAdapter adapter = new IntegerAdapter();
 
-        assertFalse(adapter.parse("text", context).isPresent());
+        assertFalse(adapter.apply("text", context).isPresent());
     }
 
     @Test
     public void longAdapter_withNumber_ShouldReturnDouble() {
         LongAdapter adapter = new LongAdapter();
 
-        assertEquals(Long.MIN_VALUE, adapter.parse(String.valueOf(Long.MIN_VALUE), context).orElseThrow());
-        assertEquals(Long.MAX_VALUE, adapter.parse(String.valueOf(Long.MAX_VALUE), context).orElseThrow());
+        assertEquals(Long.MIN_VALUE, adapter.apply(String.valueOf(Long.MIN_VALUE), context).orElseThrow());
+        assertEquals(Long.MAX_VALUE, adapter.apply(String.valueOf(Long.MAX_VALUE), context).orElseThrow());
     }
 
     @Test
     public void longAdapter_withNonNumeric_ShouldBeEmpty() {
         LongAdapter adapter = new LongAdapter();
 
-        assertFalse(adapter.parse("text", context).isPresent());
+        assertFalse(adapter.apply("text", context).isPresent());
     }
 
     @Test
     public void shortAdapter_withNumber_ShouldReturnDouble() {
         ShortAdapter adapter = new ShortAdapter();
 
-        assertEquals(Short.MIN_VALUE, adapter.parse(String.valueOf(Short.MIN_VALUE), context).orElseThrow());
-        assertEquals(Short.MAX_VALUE, adapter.parse(String.valueOf(Short.MAX_VALUE), context).orElseThrow());
+        assertEquals(Short.MIN_VALUE, adapter.apply(String.valueOf(Short.MIN_VALUE), context).orElseThrow());
+        assertEquals(Short.MAX_VALUE, adapter.apply(String.valueOf(Short.MAX_VALUE), context).orElseThrow());
     }
 
     @Test
     public void shortAdapter_withNonNumeric_ShouldBeEmpty() {
         ShortAdapter adapter = new ShortAdapter();
 
-        assertFalse(adapter.parse("text", context).isPresent());
+        assertFalse(adapter.apply("text", context).isPresent());
     }
 
     @Test
     public void adapter_withExistingId_ShouldReturnUser() {
         UserAdapter adapter = new UserAdapter();
 
-        assertEquals(JDAMock.USER, adapter.parse(String.valueOf(JDAMock.USER.getIdLong()), context).orElseThrow());
+        assertEquals(JDAMock.USER, adapter.apply(String.valueOf(JDAMock.USER.getIdLong()), context).orElseThrow());
     }
 
     @Test
     public void adapter_withNonExistingId_ShouldBeEmpty() {
         UserAdapter adapter = new UserAdapter();
 
-        assertFalse(adapter.parse("1234567890", context).isPresent());
+        assertFalse(adapter.apply("1234567890", context).isPresent());
     }
 
     @Test
     public void adapter_withExistingName_ShouldReturnUser() {
         UserAdapter adapter = new UserAdapter();
 
-        assertEquals(JDAMock.USER, adapter.parse(JDAMock.USER.getName(), context).orElseThrow());
+        assertEquals(JDAMock.USER, adapter.apply(JDAMock.USER.getName(), context).orElseThrow());
     }
 
     @Test
     public void adapter_withNonExistingName_ShouldBeEmpty() {
         UserAdapter adapter = new UserAdapter();
 
-        assertFalse(adapter.parse("thispersondoesnotexist.com", context).isPresent());
+        assertFalse(adapter.apply("thispersondoesnotexist.com", context).isPresent());
     }
 
     @Test
     public void memberAdapter_withExistingId_ShouldReturnMember() {
         MemberAdapter adapter = new MemberAdapter();
 
-        assertEquals(GuildMock.MEMBER, adapter.parse(String.valueOf(GuildMock.MEMBER.getIdLong()), context).orElseThrow());
+        assertEquals(GuildMock.MEMBER, adapter.apply(String.valueOf(GuildMock.MEMBER.getIdLong()), context).orElseThrow());
     }
 
     @Test
     public void memberAdapter_withNonExistingId_ShouldBeEmpty() {
         MemberAdapter adapter = new MemberAdapter();
 
-        assertFalse(adapter.parse("1234567890", context).isPresent());
+        assertFalse(adapter.apply("1234567890", context).isPresent());
     }
 
     @Test
     public void memberAdapter_withExistingName_ShouldReturnMember() {
         MemberAdapter adapter = new MemberAdapter();
 
-        assertEquals(GuildMock.MEMBER, adapter.parse(GuildMock.MEMBER.getNickname(), context).orElseThrow());
+        assertEquals(GuildMock.MEMBER, adapter.apply(GuildMock.MEMBER.getNickname(), context).orElseThrow());
     }
 
     @Test
     public void memberAdapter_withNonExistingName_ShouldBeEmpty() {
         MemberAdapter adapter = new MemberAdapter();
 
-        assertFalse(adapter.parse("thispersondoesnotexist.com", context).isPresent());
+        assertFalse(adapter.apply("thispersondoesnotexist.com", context).isPresent());
     }
 
     @Test
     public void memberAdapter_inNotGuildContext_ShouldBeEmpty() {
         MemberAdapter adapter = new MemberAdapter();
 
-        assertFalse(adapter.parse("name", context).isPresent());
+        assertFalse(adapter.apply("name", context).isPresent());
     }
 
     @Test
     public void roleAdapter_withExistingId_ShouldReturnMember() {
         RoleAdapter adapter = new RoleAdapter();
 
-        assertEquals(GuildMock.ROLE, adapter.parse(String.valueOf(GuildMock.ROLE.getIdLong()), context).orElseThrow());
+        assertEquals(GuildMock.ROLE, adapter.apply(String.valueOf(GuildMock.ROLE.getIdLong()), context).orElseThrow());
     }
 
     @Test
     public void roleAdapter_withNonExistingId_ShouldBeEmpty() {
         RoleAdapter adapter = new RoleAdapter();
 
-        assertFalse(adapter.parse("1234567890", context).isPresent());
+        assertFalse(adapter.apply("1234567890", context).isPresent());
     }
 
     @Test
     public void roleAdapter_withExistingName_ShouldReturnMember() {
         RoleAdapter adapter = new RoleAdapter();
 
-        assertEquals(GuildMock.ROLE, adapter.parse(GuildMock.ROLE.getName(), context).orElseThrow());
+        assertEquals(GuildMock.ROLE, adapter.apply(GuildMock.ROLE.getName(), context).orElseThrow());
     }
 
     @Test
     public void roleAdapter_withNonExistingName_ShouldBeEmpty() {
         RoleAdapter adapter = new RoleAdapter();
 
-        assertFalse(adapter.parse("thispersondoesnotexist.com", context).isPresent());
+        assertFalse(adapter.apply("thispersondoesnotexist.com", context).isPresent());
     }
 
     @Test
     public void roleAdapter_inNotGuildContext_ShouldBeEmpty() {
         RoleAdapter adapter = new RoleAdapter();
 
-        assertFalse(adapter.parse("name", context).isPresent());
+        assertFalse(adapter.apply("name", context).isPresent());
     }
 
     @Test
     public void textChannelAdapter_withExistingId_ShouldReturnMember() {
         TextChannelAdapter adapter = new TextChannelAdapter();
 
-        assertEquals(GuildMock.TEXT_CHANNEL, adapter.parse(String.valueOf(GuildMock.TEXT_CHANNEL.getIdLong()), context).orElseThrow());
+        assertEquals(GuildMock.TEXT_CHANNEL, adapter.apply(String.valueOf(GuildMock.TEXT_CHANNEL.getIdLong()), context).orElseThrow());
     }
 
     @Test
     public void textChannelAdapter_withNonExistingId_ShouldBeEmpty() {
         TextChannelAdapter adapter = new TextChannelAdapter();
 
-        assertFalse(adapter.parse("1234567890", context).isPresent());
+        assertFalse(adapter.apply("1234567890", context).isPresent());
     }
 
     @Test
     public void textChannelAdapter_withExistingName_ShouldReturnMember() {
         TextChannelAdapter adapter = new TextChannelAdapter();
 
-        assertEquals(GuildMock.TEXT_CHANNEL, adapter.parse(GuildMock.TEXT_CHANNEL.getName(), context).orElseThrow());
+        assertEquals(GuildMock.TEXT_CHANNEL, adapter.apply(GuildMock.TEXT_CHANNEL.getName(), context).orElseThrow());
     }
 
     @Test
     public void textChannelAdapter_withNonExistingName_ShouldBeEmpty() {
         TextChannelAdapter adapter = new TextChannelAdapter();
 
-        assertFalse(adapter.parse("thispersondoesnotexist.com", context).isPresent());
+        assertFalse(adapter.apply("thispersondoesnotexist.com", context).isPresent());
     }
 
     @Test
     public void textChannelAdapter_inNotGuildContext_ShouldBeEmpty() {
         TextChannelAdapter adapter = new TextChannelAdapter();
 
-        assertFalse(adapter.parse("name", context).isPresent());
+        assertFalse(adapter.apply("name", context).isPresent());
     }
 
     @Test
     public void sanitizeMention__() {
-        MemberAdapter memberAdapter = new MemberAdapter();
-
-        assertEquals("1234", memberAdapter.sanitizeMention("<@1234>"));
-        assertEquals("1234", memberAdapter.sanitizeMention("<@!1234>"));
-        assertEquals("1234", memberAdapter.sanitizeMention("<#1234>"));
-        assertEquals("1234", memberAdapter.sanitizeMention("<@&1234>"));
-
-        assertEquals("<@1234", memberAdapter.sanitizeMention("<@1234"));
-        assertEquals("<@!1234", memberAdapter.sanitizeMention("<@!1234"));
-        assertEquals("<#1234", memberAdapter.sanitizeMention("<#1234"));
-        assertEquals("<@&1234", memberAdapter.sanitizeMention("<@&1234"));
-
-        assertEquals("<@text>", memberAdapter.sanitizeMention("<@text>"));
-        assertEquals("<@!text>", memberAdapter.sanitizeMention("<@!text>"));
-        assertEquals("<#text>", memberAdapter.sanitizeMention("<#text>"));
-        assertEquals("<@&text>", memberAdapter.sanitizeMention("<@&text>"));
-
-        assertEquals("<1234>", memberAdapter.sanitizeMention("<1234>"));
-        assertEquals("<1234", memberAdapter.sanitizeMention("<1234"));
-        assertEquals("1234>", memberAdapter.sanitizeMention("1234>"));
+        assertEquals("1234", Helpers.sanitizeMention("<@1234>"));
+        assertEquals("1234", Helpers.sanitizeMention("<@!1234>"));
+        assertEquals("1234", Helpers.sanitizeMention("<#1234>"));
+        assertEquals("1234", Helpers.sanitizeMention("<@&1234>"));
+
+        assertEquals("<@1234", Helpers.sanitizeMention("<@1234"));
+        assertEquals("<@!1234", Helpers.sanitizeMention("<@!1234"));
+        assertEquals("<#1234", Helpers.sanitizeMention("<#1234"));
+        assertEquals("<@&1234", Helpers.sanitizeMention("<@&1234"));
+
+        assertEquals("<@text>", Helpers.sanitizeMention("<@text>"));
+        assertEquals("<@!text>", Helpers.sanitizeMention("<@!text>"));
+        assertEquals("<#text>", Helpers.sanitizeMention("<#text>"));
+        assertEquals("<@&text>", Helpers.sanitizeMention("<@&text>"));
+
+        assertEquals("<1234>", Helpers.sanitizeMention("<1234>"));
+        assertEquals("<1234", Helpers.sanitizeMention("<1234"));
+        assertEquals("1234>", Helpers.sanitizeMention("1234>"));
     }
 }
diff --git a/src/test/java/adapting/mock/GuildMock.java b/src/test/java/adapting/mock/GuildMock.java
index 6e6340ea2..11eafa5c7 100644
--- a/src/test/java/adapting/mock/GuildMock.java
+++ b/src/test/java/adapting/mock/GuildMock.java
@@ -624,10 +624,18 @@ public SnowflakeCacheView<MediaChannel> getMediaChannelCache() {
         return null;
     }
 
+    @Override
+    public @Nullable GuildChannel getGuildChannelById(long id) {
+        if (id == TEXT_CHANNEL.getIdLong()) {
+            return TEXT_CHANNEL;
+        }
+        return null;
+    }
+
     @NotNull
     @Override
     public List<GuildChannel> getChannels(boolean b) {
-        return null;
+        return List.of(TEXT_CHANNEL);
     }
 
     @Nullable
diff --git a/src/test/java/adapting/mock/JDACommandsMock.java b/src/test/java/adapting/mock/JDACommandsMock.java
index d4dff2f2a..052cd48c8 100644
--- a/src/test/java/adapting/mock/JDACommandsMock.java
+++ b/src/test/java/adapting/mock/JDACommandsMock.java
@@ -1,19 +1,25 @@
 package adapting.mock;
 
-import com.github.kaktushose.jda.commands.JDACommands;
-import com.github.kaktushose.jda.commands.dependency.DefaultDependencyInjector;
+import com.github.kaktushose.jda.commands.JDAContext;
+import com.github.kaktushose.jda.commands.SlashCommandUpdater;
+import com.github.kaktushose.jda.commands.dependency.DependencyInjector;
+import com.github.kaktushose.jda.commands.dispatching.DispatcherSupervisor;
+import com.github.kaktushose.jda.commands.dispatching.RuntimeSupervisor;
 import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapterRegistry;
 import com.github.kaktushose.jda.commands.dispatching.middleware.MiddlewareRegistry;
 import com.github.kaktushose.jda.commands.dispatching.validation.ValidatorRegistry;
-import com.github.kaktushose.jda.commands.reflect.ImplementationRegistry;
+import com.github.kaktushose.jda.commands.reflect.InteractionRegistry;
 
-public class JDACommandsMock extends JDACommands {
 
-    public JDACommandsMock() {
-    }
-
-    @Override
-    public ImplementationRegistry getImplementationRegistry() {
-       return new ImplementationRegistry(new DefaultDependencyInjector(), new MiddlewareRegistry(), new TypeAdapterRegistry(), new ValidatorRegistry());
-    }
+public record JDACommandsMock(
+        JDAContext jdaContext,
+        DispatcherSupervisor dispatcherSupervisor,
+        MiddlewareRegistry middlewareRegistry,
+        TypeAdapterRegistry adapterRegistry,
+        ValidatorRegistry validatorRegistry,
+        DependencyInjector dependencyInjector,
+        InteractionRegistry interactionRegistry,
+        SlashCommandUpdater updater,
+        RuntimeSupervisor runtimeSupervisor
+) {
 }
diff --git a/src/test/java/commands/CommandDefinitionTestController.java b/src/test/java/commands/CommandDefinitionTestController.java
index 8cbe29770..ed1ac08c6 100644
--- a/src/test/java/commands/CommandDefinitionTestController.java
+++ b/src/test/java/commands/CommandDefinitionTestController.java
@@ -51,11 +51,6 @@ public void optionalAfterOptional(CommandEvent event, @Optional String s, @Optio
 
     }
 
-    @SlashCommand(value = "k", isActive = false)
-    public void inactive() {
-
-    }
-
     @SlashCommand("m")
     @Cooldown(value = 0, timeUnit = TimeUnit.MILLISECONDS)
     public void zeroCooldown(CommandEvent event) {
diff --git a/src/test/java/commands/SlashCommandDefinitionTest.java b/src/test/java/commands/SlashCommandDefinitionTest.java
index 447ed0737..eab854146 100644
--- a/src/test/java/commands/SlashCommandDefinitionTest.java
+++ b/src/test/java/commands/SlashCommandDefinitionTest.java
@@ -1,10 +1,12 @@
 package commands;
 
-import com.github.kaktushose.jda.commands.dispatching.interactions.commands.CommandEvent;
+import com.github.kaktushose.jda.commands.annotations.interactions.Interaction;
 import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapterRegistry;
+import com.github.kaktushose.jda.commands.dispatching.interactions.commands.CommandEvent;
 import com.github.kaktushose.jda.commands.dispatching.validation.ValidatorRegistry;
+import com.github.kaktushose.jda.commands.reflect.CooldownDefinition;
+import com.github.kaktushose.jda.commands.reflect.MethodBuildContext;
 import com.github.kaktushose.jda.commands.reflect.interactions.commands.SlashCommandDefinition;
-import net.dv8tion.jda.api.interactions.commands.localization.LocalizationFunction;
 import net.dv8tion.jda.api.interactions.commands.localization.ResourceBundleLocalizationFunction;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
@@ -12,14 +14,13 @@
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.Optional;
+import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
 import static org.junit.jupiter.api.Assertions.*;
 
 public class SlashCommandDefinitionTest {
 
-    private static final LocalizationFunction LOCALIZATION_FUNCTION = ResourceBundleLocalizationFunction.empty().build();
-    
     private static Class<?> controller;
     private static ValidatorRegistry validator;
 
@@ -34,95 +35,107 @@ public static void setup() {
         adapter.unregister(UnsupportedType.class);
     }
 
+    public static MethodBuildContext getBuildContext(Method method) {
+        return new MethodBuildContext(
+                validator,
+                ResourceBundleLocalizationFunction.empty().build(),
+                controller.getAnnotation(Interaction.class),
+                Set.of(),
+                CooldownDefinition.build(null),
+                method,
+                Set.of()
+        );
+    }
+
     @Test
     public void method_withoutAnnotation_ShouldReturnEmpty() throws NoSuchMethodException {
         Method method = controller.getDeclaredMethod("noAnnotation");
 
-        assertEquals(Optional.empty(), SlashCommandDefinition.build(method, validator, LOCALIZATION_FUNCTION));
+        assertEquals(Optional.empty(), SlashCommandDefinition.build(getBuildContext(method)));
     }
 
     @Test
     public void method_withoutArgs_ShouldReturnEmpty() throws NoSuchMethodException {
         Method method = controller.getDeclaredMethod("noArgs");
 
-        assertEquals(Optional.empty(), SlashCommandDefinition.build(method, validator, LOCALIZATION_FUNCTION));
+        assertEquals(Optional.empty(), SlashCommandDefinition.build(getBuildContext(method)));
     }
 
     @Test
     public void method_withoutCommandEvent_ShouldReturnEmpty() throws NoSuchMethodException {
         Method method = controller.getDeclaredMethod("noCommandEvent", int.class);
 
-        assertEquals(Optional.empty(), SlashCommandDefinition.build(method, validator, LOCALIZATION_FUNCTION));
+        assertEquals(Optional.empty(), SlashCommandDefinition.build(getBuildContext(method)));
     }
 
     @Test
     public void method_withWrongCommandEvent_ShouldReturnEmpty() throws NoSuchMethodException {
         Method method = controller.getDeclaredMethod("wrongCommandEvent", int.class, CommandEvent.class);
 
-        assertEquals(Optional.empty(), SlashCommandDefinition.build(method, validator, LOCALIZATION_FUNCTION));
+        assertEquals(Optional.empty(), SlashCommandDefinition.build(getBuildContext(method)));
     }
 
     @Test
     public void method_withCommandEvent_ShouldWork() throws NoSuchMethodException, InvocationTargetException, InstantiationException, IllegalAccessException {
         Method method = controller.getDeclaredMethod("commandEvent", CommandEvent.class);
-        SlashCommandDefinition definition = SlashCommandDefinition.build(method, validator, LOCALIZATION_FUNCTION).orElse(null);
+        SlashCommandDefinition definition = SlashCommandDefinition.build(getBuildContext(method)).orElse(null);
 
         assertNotNull(definition);
 
         assertEquals(definition.getMethod(), method);
 
         assertEquals(1, definition.getParameters().size());
-        assertEquals(CommandEvent.class, definition.getParameters().get(0).getType());
+        assertEquals(CommandEvent.class, definition.getParameters().get(0).type());
     }
 
     @Test
     public void method_withUnsupportedType_ShouldWork() throws NoSuchMethodException, InvocationTargetException, InstantiationException, IllegalAccessException {
         Method method = controller.getDeclaredMethod("unsupported", CommandEvent.class, UnsupportedType.class);
 
-        SlashCommandDefinition definition = SlashCommandDefinition.build(method, validator, LOCALIZATION_FUNCTION).orElse(null);
+        SlashCommandDefinition definition = SlashCommandDefinition.build(getBuildContext(method)).orElse(null);
 
         assertNotNull(definition);
 
         assertEquals(definition.getMethod(), method);
 
         assertEquals(2, definition.getParameters().size());
-        assertEquals(CommandEvent.class, definition.getParameters().get(0).getType());
-        assertEquals(UnsupportedType.class, definition.getParameters().get(1).getType());
+        assertEquals(CommandEvent.class, definition.getParameters().get(0).type());
+        assertEquals(UnsupportedType.class, definition.getParameters().get(1).type());
     }
 
     @Test
     public void method_withStringArray_ShouldWork() throws NoSuchMethodException, InvocationTargetException, InstantiationException, IllegalAccessException {
         Method method = controller.getDeclaredMethod("arrayArgument", CommandEvent.class, String[].class);
-        SlashCommandDefinition definition = SlashCommandDefinition.build(method, validator, LOCALIZATION_FUNCTION).orElse(null);
+        SlashCommandDefinition definition = SlashCommandDefinition.build(getBuildContext(method)).orElse(null);
 
         assertNotNull(definition);
 
         assertEquals(definition.getMethod(), method);
 
         assertEquals(2, definition.getParameters().size());
-        assertEquals(CommandEvent.class, definition.getParameters().get(0).getType());
-        assertEquals(String[].class, definition.getParameters().get(1).getType());
+        assertEquals(CommandEvent.class, definition.getParameters().get(0).type());
+        assertEquals(String[].class, definition.getParameters().get(1).type());
     }
 
     @Test
     public void method_withArgumentsAfterArray_ShouldReturnEmpty() throws NoSuchMethodException {
         Method method = controller.getDeclaredMethod("argsAfterArray", CommandEvent.class, String[].class, int.class);
 
-        assertEquals(Optional.empty(), SlashCommandDefinition.build(method, validator, LOCALIZATION_FUNCTION));
+        assertEquals(Optional.empty(), SlashCommandDefinition.build(getBuildContext(method)));
     }
 
     @Test
     public void method_withArgumentsAfterOptional_ShouldWork() throws NoSuchMethodException {
         Method method = controller.getDeclaredMethod("argsAfterOptional", CommandEvent.class, String.class, int.class);
 
-        SlashCommandDefinition definition = SlashCommandDefinition.build(method, validator, LOCALIZATION_FUNCTION).orElse(null);
+        SlashCommandDefinition definition = SlashCommandDefinition.build(getBuildContext(method)).orElse(null);
 
         assertNotNull(definition);
 
         assertEquals(definition.getMethod(), method);
 
         assertEquals(3, definition.getParameters().size());
-        assertEquals(CommandEvent.class, definition.getParameters().get(0).getType());
+        assertEquals(CommandEvent.class, definition.getParameters().get(0).type());
         assertTrue(definition.getParameters().get(1).isOptional());
         assertFalse(definition.getParameters().get(2).isOptional());
     }
@@ -130,29 +143,22 @@ public void method_withArgumentsAfterOptional_ShouldWork() throws NoSuchMethodEx
     @Test
     public void method_withOptionalAfterOptional_ShouldWork() throws NoSuchMethodException, InvocationTargetException, InstantiationException, IllegalAccessException {
         Method method = controller.getDeclaredMethod("optionalAfterOptional", CommandEvent.class, String.class, int.class);
-        SlashCommandDefinition definition = SlashCommandDefinition.build(method, validator, LOCALIZATION_FUNCTION).orElse(null);
+        SlashCommandDefinition definition = SlashCommandDefinition.build(getBuildContext(method)).orElse(null);
 
         assertNotNull(definition);
 
         assertEquals(definition.getMethod(), method);
 
         assertEquals(3, definition.getParameters().size());
-        assertEquals(CommandEvent.class, definition.getParameters().get(0).getType());
-        assertEquals(String.class, definition.getParameters().get(1).getType());
-        assertEquals(Integer.class, definition.getParameters().get(2).getType());
-    }
-
-    @Test
-    public void command_isInactive_ShouldReturnEmpty() throws NoSuchMethodException {
-        Method method = controller.getDeclaredMethod("inactive");
-
-        assertEquals(Optional.empty(), SlashCommandDefinition.build(method, validator, LOCALIZATION_FUNCTION));
+        assertEquals(CommandEvent.class, definition.getParameters().get(0).type());
+        assertEquals(String.class, definition.getParameters().get(1).type());
+        assertEquals(Integer.class, definition.getParameters().get(2).type());
     }
 
     @Test
     public void cooldown_zeroTimeUnits_ShouldNotBeSet() throws NoSuchMethodException {
         Method method = controller.getDeclaredMethod("zeroCooldown", CommandEvent.class);
-        SlashCommandDefinition definition = SlashCommandDefinition.build(method, validator, LOCALIZATION_FUNCTION).orElse(null);
+        SlashCommandDefinition definition = SlashCommandDefinition.build(getBuildContext(method)).orElse(null);
 
         assertNotNull(definition);
 
@@ -162,19 +168,19 @@ public void cooldown_zeroTimeUnits_ShouldNotBeSet() throws NoSuchMethodException
     @Test
     public void cooldown_tenMilliseconds_ShouldWork() throws NoSuchMethodException {
         Method method = controller.getDeclaredMethod("cooldown", CommandEvent.class);
-        SlashCommandDefinition definition = SlashCommandDefinition.build(method, validator, LOCALIZATION_FUNCTION).orElse(null);
+        SlashCommandDefinition definition = SlashCommandDefinition.build(getBuildContext(method)).orElse(null);
 
         assertNotNull(definition);
 
         assertTrue(definition.hasCooldown());
-        assertEquals(10, definition.getCooldown().getDelay());
-        assertEquals(TimeUnit.MILLISECONDS, definition.getCooldown().getTimeUnit());
+        assertEquals(10, definition.getCooldown().delay());
+        assertEquals(TimeUnit.MILLISECONDS, definition.getCooldown().timeUnit());
     }
 
     @Test
     public void permission_oneString_ShouldWork() throws NoSuchMethodException {
         Method method = controller.getDeclaredMethod("permission", CommandEvent.class);
-        SlashCommandDefinition definition = SlashCommandDefinition.build(method, validator, LOCALIZATION_FUNCTION).orElse(null);
+        SlashCommandDefinition definition = SlashCommandDefinition.build(getBuildContext(method)).orElse(null);
 
         assertNotNull(definition);
 
diff --git a/src/test/java/controller/InteractionControllerDefinitionTest.java b/src/test/java/controller/InteractionControllerDefinitionTest.java
index e42070feb..98346f961 100644
--- a/src/test/java/controller/InteractionControllerDefinitionTest.java
+++ b/src/test/java/controller/InteractionControllerDefinitionTest.java
@@ -1,13 +1,12 @@
 package controller;
 
 import com.github.kaktushose.jda.commands.dependency.DefaultDependencyInjector;
-import com.github.kaktushose.jda.commands.dispatching.interactions.commands.CommandEvent;
 import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapterRegistry;
+import com.github.kaktushose.jda.commands.dispatching.interactions.commands.CommandEvent;
 import com.github.kaktushose.jda.commands.dispatching.validation.ValidatorRegistry;
-import com.github.kaktushose.jda.commands.reflect.interactions.commands.SlashCommandDefinition;
 import com.github.kaktushose.jda.commands.reflect.InteractionControllerDefinition;
+import com.github.kaktushose.jda.commands.reflect.interactions.commands.SlashCommandDefinition;
 import commands.UnsupportedType;
-import net.dv8tion.jda.api.interactions.commands.Command;
 import net.dv8tion.jda.api.interactions.commands.localization.LocalizationFunction;
 import net.dv8tion.jda.api.interactions.commands.localization.ResourceBundleLocalizationFunction;
 import org.junit.jupiter.api.BeforeAll;
@@ -43,11 +42,17 @@ public static void setup() {
     public void command_NoValues_ShouldAdoptControllerValues() throws NoSuchMethodException {
         Method method = controller.getDeclaredMethod("adopt", CommandEvent.class);
 
-        InteractionControllerDefinition controllerDefinition = InteractionControllerDefinition.build(controller, validators, dependencyInjector, LOCALIZATION_FUNCTION).orElse(null);
+        InteractionControllerDefinition controllerDefinition = InteractionControllerDefinition.build(
+                controller,
+                validators,
+                dependencyInjector,
+                LOCALIZATION_FUNCTION
+        );
+
         assertNotNull(controllerDefinition);
-        SlashCommandDefinition definition = controllerDefinition.getCommands().stream()
-                .filter(it -> it.getCommandType() == Command.Type.SLASH)
-                .map(it -> (SlashCommandDefinition) it)
+        SlashCommandDefinition definition = controllerDefinition.definitions().stream()
+                .filter(SlashCommandDefinition.class::isInstance)
+                .map(SlashCommandDefinition.class::cast)
                 .filter(c -> c.getMethod().equals(method))
                 .findFirst().orElse(null);
         assertNotNull(definition);
@@ -56,8 +61,8 @@ public void command_NoValues_ShouldAdoptControllerValues() throws NoSuchMethodEx
         assertTrue(definition.getName().contains("super"));
 
         assertTrue(definition.hasCooldown());
-        assertEquals(10, definition.getCooldown().getDelay());
-        assertEquals(TimeUnit.MILLISECONDS, definition.getCooldown().getTimeUnit());
+        assertEquals(10, definition.getCooldown().delay());
+        assertEquals(TimeUnit.MILLISECONDS, definition.getCooldown().timeUnit());
 
         assertEquals(1, definition.getPermissions().size());
         assertTrue(definition.getPermissions().contains("superPermission"));
@@ -67,11 +72,17 @@ public void command_NoValues_ShouldAdoptControllerValues() throws NoSuchMethodEx
     public void command_OwnValues_ShouldCombineOrOverride() throws NoSuchMethodException {
         Method method = controller.getDeclaredMethod("combine", CommandEvent.class);
 
-        InteractionControllerDefinition controllerDefinition = InteractionControllerDefinition.build(controller, validators, dependencyInjector, LOCALIZATION_FUNCTION).orElse(null);
+        InteractionControllerDefinition controllerDefinition = InteractionControllerDefinition.build(
+                controller,
+                validators,
+                dependencyInjector,
+                LOCALIZATION_FUNCTION
+        );
+
         assertNotNull(controllerDefinition);
-        SlashCommandDefinition definition = controllerDefinition.getCommands().stream()
-                .filter(it -> it.getCommandType() == Command.Type.SLASH)
-                .map(it -> (SlashCommandDefinition) it)
+        SlashCommandDefinition definition = controllerDefinition.definitions().stream()
+                .filter(SlashCommandDefinition.class::isInstance)
+                .map(SlashCommandDefinition.class::cast)
                 .filter(c -> c.getMethod().equals(method))
                 .findFirst().orElse(null);
         assertNotNull(definition);
@@ -79,8 +90,8 @@ public void command_OwnValues_ShouldCombineOrOverride() throws NoSuchMethodExcep
         assertEquals("super sub", definition.getName());
 
         assertTrue(definition.hasCooldown());
-        assertEquals(5, definition.getCooldown().getDelay());
-        assertEquals(TimeUnit.DAYS, definition.getCooldown().getTimeUnit());
+        assertEquals(5, definition.getCooldown().delay());
+        assertEquals(TimeUnit.DAYS, definition.getCooldown().timeUnit());
 
         assertEquals(2, definition.getPermissions().size());
         assertTrue(definition.getPermissions().contains("superPermission"));
diff --git a/src/test/java/parameters/ParameterDefinitionTest.java b/src/test/java/parameters/ParameterDefinitionTest.java
index be604ba68..1f365390a 100644
--- a/src/test/java/parameters/ParameterDefinitionTest.java
+++ b/src/test/java/parameters/ParameterDefinitionTest.java
@@ -34,7 +34,7 @@ public void method_withPrimitiveInt_ShouldWrap() throws NoSuchMethodException {
         Method method = controller.getDeclaredMethod("primitives", int.class);
         ParameterDefinition parameter = ParameterDefinition.build(method.getParameters()[0], validatorRegistry);
 
-        assertEquals(Integer.class, parameter.getType());
+        assertEquals(Integer.class, parameter.type());
         assertTrue(parameter.isPrimitive());
     }
 
@@ -44,7 +44,7 @@ public void optional_withoutDefault_ShouldBeNull() throws NoSuchMethodException
         ParameterDefinition parameter = ParameterDefinition.build(method.getParameters()[0], validatorRegistry);
 
         assertTrue(parameter.isOptional());
-        assertNull(parameter.getDefaultValue());
+        assertNull(parameter.defaultValue());
     }
 
     @Test
@@ -53,7 +53,7 @@ public void optional_withDefault_ShouldWork() throws NoSuchMethodException {
         ParameterDefinition parameter = ParameterDefinition.build(method.getParameters()[0], validatorRegistry);
 
         assertTrue(parameter.isOptional());
-        assertEquals("default", parameter.getDefaultValue());
+        assertEquals("default", parameter.defaultValue());
     }
 
     @Test
@@ -61,10 +61,10 @@ public void constraintMin_withLimit10_ShouldWork() throws NoSuchMethodException
         Method method = controller.getDeclaredMethod("constraint", int.class);
         ParameterDefinition parameter = ParameterDefinition.build(method.getParameters()[0], validatorRegistry);
 
-        assertEquals(1, parameter.getConstraints().size());
-        assertEquals(10, ((Min) parameter.getConstraints().get(0).getAnnotation()).value());
-        assertEquals(MinimumValidator.class, parameter.getConstraints().get(0).getValidator().getClass());
-        assertFalse(parameter.getConstraints().get(0).getMessage().isEmpty());
+        assertEquals(1, parameter.constraints().size());
+        assertEquals(10, ((Min) parameter.constraints().get(0).annotation()).value());
+        assertEquals(MinimumValidator.class, parameter.constraints().get(0).validator().getClass());
+        assertFalse(parameter.constraints().get(0).message().isEmpty());
     }
 
     @Test
@@ -72,6 +72,6 @@ public void constraint_withMessage_ShouldWork() throws NoSuchMethodException {
         Method method = controller.getDeclaredMethod("constraintWithMessage", int.class);
         ParameterDefinition parameter = ParameterDefinition.build(method.getParameters()[0], validatorRegistry);
 
-        assertEquals("error message", parameter.getConstraints().get(0).getMessage());
+        assertEquals("error message", parameter.constraints().get(0).message());
     }
 }

From d75b8db7ebf62352c4df284275f2f2009709fd02 Mon Sep 17 00:00:00 2001
From: Kaktushose <42280757+Kaktushose@users.noreply.github.com>
Date: Wed, 25 Dec 2024 17:38:27 +0100
Subject: [PATCH 13/38] [REFACTOR] Internal dispatching flow and reply API
 (#141)

* first pass on VirtualThread refactor

* refactor CommandDispatcher

* prepare Dispatchers for refactoring and reimplement AutoCompleteDispatcher

* Make Runtime closeable

* Add Event abstraction over jda and EventHandlers for command and autocomplete

* introduce new ExecutionContext and simplify CommandHandler

* Use new ExecutionContext in middleware and adapters, restructure EventHandler

* Delete JDa Event wrapper

* remove CommandExecutionContext.java and remove context from type adapting flow

* delete old files

* fix type errors

* move method invoke to definition classes

* Move classes out of refactor sub package

* Refactor ExecutionContext and stuff

* fix wrong middleware priority

* Add KeyValueStore and missing package-info.java files

* Add KeyValueStore and missing package-info.java files

* Fix double method arguments

* Reduce generics complexity

* Refactor MiddlewareRegistry

* Split ExecutionContext.java

* refactor event classes and reply logic

* fix middleware order bug

* make components attachable again

* reimplement replyModal

* first pass on ButtonHandler

* seal EventHandler

* seal EventHandler

* Merge InvocationContext and Invocation

* refactor reply api

* Add getter for JDA Events in Event

* make "No interaction found" error message less ambiguous

* Refactor reply system (#142)

* make reply methods return Message object and reimplement keep components

* remove latest reply from runtime

* replace ephemeral boolean flag with ReplyConfig and introduce GlobalReplyConfig

* write unit tests for new ReplyConfig helper method and fix old unit tests

* simplify switch

* Hopefully fix middleware priorities

* Move HandlerContext out of InvocationContext

* Move InstanceSupplier out of InvocationContext

* bump code

* Explicitly state dispatching user api

* Yes..

* fully implement modals and components

* first pass on static components

* Fix static components, refactor component reply

* improve error handling

* Remove unused method

* Add docs for context, handling and Runtime

* fix custom id bugs

* write documentation

* more documentation and simplify component reply

* even more documentation

* even more documentation

* formatting

* add missing method

* fix component bug

* more documentation

* small docs fix

* Add logging for EventHandler, JDAEventListener and Runtime

* Add ExpirationStrategy

* stuff

* refactor package structure

* add docs for ExpirationStrategy

* Expose dispatching package

* Add jda javadoc reference to maven java doc plugin

* Update src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Interaction.java

Co-authored-by: Nick Hensel <47005420+Goldmensch@users.noreply.github.com>

* Update src/main/java/com/github/kaktushose/jda/commands/annotations/Implementation.java

Co-authored-by: Nick Hensel <47005420+Goldmensch@users.noreply.github.com>

* Update src/main/java/com/github/kaktushose/jda/commands/dispatching/events/ReplyableEvent.java

Co-authored-by: Nick Hensel <47005420+Goldmensch@users.noreply.github.com>

* Update src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/MessageReply.java

Co-authored-by: Nick Hensel <47005420+Goldmensch@users.noreply.github.com>

* Update src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/EventHandler.java

Co-authored-by: Nick Hensel <47005420+Goldmensch@users.noreply.github.com>

* improve docs

* remove generic in getSelectMenu

* rename Components to Component

* update documentation

* update documentation

* update lastActivity

* Add flowchart picture and introduce javadoc directory

* resolve review

* Add examples

---------

Co-authored-by: Nick Hensel <nickhensel25@icloud.com>
Co-authored-by: Nick Hensel <47005420+Goldmensch@users.noreply.github.com>
---
 .github/workflows/docs.yml                    |   4 +-
 pom.xml                                       |   7 +-
 src/examples/ReportCommand.java               |   1 +
 .../kaktushose/jda/commands/Helpers.java      |  91 -----
 .../kaktushose/jda/commands/JDACommands.java  | 170 +++------
 .../commands/annotations/Implementation.java  |   5 +-
 .../interactions/AutoComplete.java            |  27 +-
 .../annotations/interactions/Button.java      |  42 +--
 .../annotations/interactions/Choices.java     |   1 +
 .../interactions/ContextCommand.java          |  45 +--
 .../interactions/EntitySelectMenu.java        |  44 +--
 .../annotations/interactions/Interaction.java |  32 +-
 .../annotations/interactions/Modal.java       |  35 +-
 .../annotations/interactions/Optional.java    |   1 +
 .../annotations/interactions/ReplyConfig.java |  63 ++++
 .../interactions/SelectOption.java            |   1 -
 .../interactions/SlashCommand.java            |  62 ++--
 .../interactions/StaticInstance.java          |  17 -
 .../interactions/StringSelectMenu.java        |  50 +--
 .../annotations/interactions/TextInput.java   |  15 +-
 .../jda/commands/data/package-info.java       |   4 -
 .../jda/commands/dependency/package-info.java |   2 +-
 .../dispatching/DispatcherSupervisor.java     | 100 -----
 .../dispatching/ExpirationStrategy.java       |  29 ++
 .../dispatching/RuntimeSupervisor.java        | 254 -------------
 .../dispatching/adapter/TypeAdapter.java      |  12 +-
 .../adapter/TypeAdapterRegistry.java          | 100 +----
 .../adapter/impl/AudioChannelAdapter.java     |  15 +-
 .../adapter/impl/BooleanAdapter.java          |   9 +-
 .../dispatching/adapter/impl/ByteAdapter.java |   9 +-
 .../adapter/impl/CharacterAdapter.java        |   9 +-
 .../adapter/impl/DoubleAdapter.java           |   9 +-
 .../adapter/impl/FloatAdapter.java            |   9 +-
 .../adapter/impl/GuildChannelAdapter.java     |  15 +-
 .../impl/GuildMessageChannelAdapter.java      |  15 +-
 .../adapter/impl/IntegerAdapter.java          |   9 +-
 .../dispatching/adapter/impl/LongAdapter.java |   9 +-
 .../adapter/impl/MemberAdapter.java           |  15 +-
 .../adapter/impl/NewsChannelAdapter.java      |  15 +-
 .../dispatching/adapter/impl/RoleAdapter.java |  15 +-
 .../adapter/impl/ShortAdapter.java            |   9 +-
 .../adapter/impl/StageChannelAdapter.java     |  15 +-
 .../adapter/impl/TextChannelAdapter.java      |  15 +-
 .../adapter/impl/ThreadChannelAdapter.java    |  15 +-
 .../dispatching/adapter/impl/UserAdapter.java |  13 +-
 .../adapter/impl/VoiceChannelAdapter.java     |  15 +-
 .../context/InvocationContext.java            |  33 ++
 .../{ => context}/KeyValueStore.java          |  10 +-
 .../dispatching/context/package-info.java     |   2 +
 .../commands/dispatching/events/Event.java    | 210 +++++++++++
 .../events/ModalReplyableEvent.java           |  60 +++
 .../dispatching/events/ReplyableEvent.java    | 105 ++++++
 .../interactions}/AutoCompleteEvent.java      |  55 +--
 .../events/interactions/CommandEvent.java     |  42 +++
 .../events/interactions/ComponentEvent.java   |  43 +++
 .../events/interactions/ModalEvent.java       |  32 ++
 .../events/interactions/package-info.java     |   4 +
 .../dispatching/events/package-info.java      |   2 +
 .../handling/AutoCompleteHandler.java         |  33 ++
 .../handling/ComponentHandler.java            |  52 +++
 .../handling/DispatchingContext.java          |  17 +
 .../dispatching/handling/EventHandler.java    | 106 ++++++
 .../dispatching/handling/ModalHandler.java    |  43 +++
 .../command/ContextCommandHandler.java        |  32 ++
 .../handling/command/SlashCommandHandler.java | 107 ++++++
 .../handling/command/package-info.java        |   1 +
 .../dispatching/handling/package-info.java    |   4 +
 .../dispatching/interactions/Context.java     | 189 ----------
 .../interactions/GenericDispatcher.java       |  73 ----
 .../interactions/GenericEvent.java            |  96 -----
 .../autocomplete/AutoCompleteDispatcher.java  |  81 ----
 .../commands/CommandDispatcher.java           | 130 -------
 .../interactions/commands/CommandEvent.java   |  42 ---
 .../commands/SlashCommandContext.java         | 146 --------
 .../components/ComponentDispatcher.java       | 128 -------
 .../components/ComponentEvent.java            |  53 ---
 .../interactions/modals/ModalDispatcher.java  | 115 ------
 .../interactions/modals/ModalEvent.java       |  36 --
 .../internal/JDAEventListener.java            |  76 ++++
 .../dispatching/internal/Runtime.java         | 147 ++++++++
 .../dispatching/middleware/Middleware.java    |  12 +-
 .../middleware/MiddlewareRegistry.java        |  35 +-
 .../dispatching/middleware/Priority.java      |  17 +-
 .../middleware/impl/ConstraintMiddleware.java |  34 +-
 .../middleware/impl/CooldownMiddleware.java   |  36 +-
 .../impl/PermissionsMiddleware.java           |  23 +-
 .../middleware/impl/package-info.java         |   2 +
 .../dispatching/middleware/package-info.java  |   2 +
 .../commands/dispatching/reply/Component.java |  65 ++++
 .../dispatching/reply/ComponentReply.java     |  23 ++
 .../dispatching/reply/ConfigurableReply.java  | 198 ++++++++++
 .../dispatching/reply/GlobalReplyConfig.java  |  31 ++
 .../dispatching/reply/MessageReply.java       | 147 ++++++++
 .../dispatching/reply/ModalReplyable.java     |  39 --
 .../jda/commands/dispatching/reply/Reply.java |  87 +++++
 .../dispatching/reply/ReplyContext.java       | 246 -------------
 .../commands/dispatching/reply/Replyable.java | 347 ------------------
 .../dispatching/reply/components/Buttons.java |  59 ---
 .../reply/components/Component.java           |  14 -
 .../reply/components/SelectMenus.java         |  85 -----
 .../reply/components/package-info.java        |   4 -
 .../dispatching/validation/Validator.java     |   6 +-
 .../validation/impl/MaximumValidator.java     |   6 +-
 .../validation/impl/MinimumValidator.java     |   6 +-
 .../impl/NotPermissionValidator.java          |   6 +-
 .../validation/impl/NotRoleValidator.java     |   8 +-
 .../validation/impl/NotUserValidator.java     |   8 +-
 .../validation/impl/PermissionValidator.java  |   6 +-
 .../validation/impl/RoleValidator.java        |   8 +-
 .../validation/impl/UserValidator.java        |   8 +-
 .../commands/{data => embeds}/EmbedCache.java |   2 +-
 .../commands/{data => embeds}/EmbedDTO.java   |   6 +-
 .../commands/embeds/ErrorMessageFactory.java  |  77 ----
 .../DefaultErrorMessageFactory.java           |  45 ++-
 .../embeds/error/ErrorMessageFactory.java     |  72 ++++
 .../{ => error}/JsonErrorMessageFactory.java  |  57 +--
 .../commands/embeds/error/package-info.java   |   4 +
 .../jda/commands/embeds/package-info.java     |   6 +-
 .../jda/commands/internal/Helpers.java        | 139 +++++++
 .../commands/{ => internal}/JDAContext.java   |   2 +-
 .../register}/CommandTree.java                |   4 +-
 .../register}/SlashCommandUpdater.java        |   6 +-
 .../{data => internal/register}/TreeNode.java |   7 +-
 .../DefaultPermissionsProvider.java           |  41 ++-
 .../permissions/PermissionsProvider.java      |  48 ++-
 .../reflect/ImplementationRegistry.java       |   4 +-
 .../commands/reflect/InteractionRegistry.java |  28 ++
 .../commands/reflect/MethodBuildContext.java  |   4 +
 .../interactions/AutoCompleteDefinition.java  |   4 +-
 .../reflect/interactions/CustomId.java        |  97 ++++-
 .../EphemeralInteractionDefinition.java       |  19 +-
 .../GenericInteractionDefinition.java         |  10 +-
 .../reflect/interactions/ModalDefinition.java |  31 +-
 .../reflect/interactions/ReplyConfig.java     |  24 ++
 .../commands/ContextCommandDefinition.java    |  25 +-
 .../commands/GenericCommandDefinition.java    |  12 +-
 .../commands/SlashCommandDefinition.java      |  13 +-
 .../components/ButtonDefinition.java          |  13 +-
 .../GenericComponentDefinition.java           |  25 +-
 .../menus/EntitySelectMenuDefinition.java     |  21 +-
 .../menus/GenericSelectMenuDefinition.java    |  28 +-
 .../menus/StringSelectMenuDefinition.java     |  17 +-
 .../scope/DefaultGuildScopeProvider.java      |   1 +
 src/main/java/module-info.java                |  40 ++
 src/main/javadoc/doc-files/flowchart.png      | Bin 0 -> 129529 bytes
 src/main/javadoc/overview.md                  |  65 ++++
 src/test/java/adapting/CustomTypeAdapter.java |   5 +-
 .../adapting/TypeAdapterRegistryTest.java     | 347 +++++++++---------
 src/test/java/adapting/TypeAdapterTest.java   | 113 +++---
 .../java/adapting/mock/JDACommandsMock.java   |  13 +-
 .../TypeAdapterRegistryTestController.java    |   2 +-
 .../CommandDefinitionTestController.java      |   2 +-
 .../commands/SlashCommandDefinitionTest.java  |   2 +-
 .../ControllerDefinitionTestController.java   |   2 +-
 .../InteractionControllerDefinitionTest.java  |   2 +-
 src/test/java/reply/CustomController.java     |  29 ++
 src/test/java/reply/DefaultController.java    |  21 ++
 src/test/java/reply/ReplyConfigTest.java      |  68 ++++
 158 files changed, 3423 insertions(+), 3502 deletions(-)
 delete mode 100644 src/main/java/com/github/kaktushose/jda/commands/Helpers.java
 create mode 100644 src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/ReplyConfig.java
 delete mode 100644 src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/StaticInstance.java
 delete mode 100644 src/main/java/com/github/kaktushose/jda/commands/data/package-info.java
 delete mode 100644 src/main/java/com/github/kaktushose/jda/commands/dispatching/DispatcherSupervisor.java
 create mode 100644 src/main/java/com/github/kaktushose/jda/commands/dispatching/ExpirationStrategy.java
 delete mode 100644 src/main/java/com/github/kaktushose/jda/commands/dispatching/RuntimeSupervisor.java
 create mode 100644 src/main/java/com/github/kaktushose/jda/commands/dispatching/context/InvocationContext.java
 rename src/main/java/com/github/kaktushose/jda/commands/dispatching/{ => context}/KeyValueStore.java (88%)
 create mode 100644 src/main/java/com/github/kaktushose/jda/commands/dispatching/context/package-info.java
 create mode 100644 src/main/java/com/github/kaktushose/jda/commands/dispatching/events/Event.java
 create mode 100644 src/main/java/com/github/kaktushose/jda/commands/dispatching/events/ModalReplyableEvent.java
 create mode 100644 src/main/java/com/github/kaktushose/jda/commands/dispatching/events/ReplyableEvent.java
 rename src/main/java/com/github/kaktushose/jda/commands/dispatching/{interactions/autocomplete => events/interactions}/AutoCompleteEvent.java (89%)
 create mode 100644 src/main/java/com/github/kaktushose/jda/commands/dispatching/events/interactions/CommandEvent.java
 create mode 100644 src/main/java/com/github/kaktushose/jda/commands/dispatching/events/interactions/ComponentEvent.java
 create mode 100644 src/main/java/com/github/kaktushose/jda/commands/dispatching/events/interactions/ModalEvent.java
 create mode 100644 src/main/java/com/github/kaktushose/jda/commands/dispatching/events/interactions/package-info.java
 create mode 100644 src/main/java/com/github/kaktushose/jda/commands/dispatching/events/package-info.java
 create mode 100644 src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/AutoCompleteHandler.java
 create mode 100644 src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/ComponentHandler.java
 create mode 100644 src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/DispatchingContext.java
 create mode 100644 src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/EventHandler.java
 create mode 100644 src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/ModalHandler.java
 create mode 100644 src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/command/ContextCommandHandler.java
 create mode 100644 src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/command/SlashCommandHandler.java
 create mode 100644 src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/command/package-info.java
 create mode 100644 src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/package-info.java
 delete mode 100644 src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/Context.java
 delete mode 100644 src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/GenericDispatcher.java
 delete mode 100644 src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/GenericEvent.java
 delete mode 100644 src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/autocomplete/AutoCompleteDispatcher.java
 delete mode 100644 src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/commands/CommandDispatcher.java
 delete mode 100644 src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/commands/CommandEvent.java
 delete mode 100644 src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/commands/SlashCommandContext.java
 delete mode 100644 src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/components/ComponentDispatcher.java
 delete mode 100644 src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/components/ComponentEvent.java
 delete mode 100644 src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/modals/ModalDispatcher.java
 delete mode 100644 src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/modals/ModalEvent.java
 create mode 100644 src/main/java/com/github/kaktushose/jda/commands/dispatching/internal/JDAEventListener.java
 create mode 100644 src/main/java/com/github/kaktushose/jda/commands/dispatching/internal/Runtime.java
 create mode 100644 src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/package-info.java
 create mode 100644 src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/package-info.java
 create mode 100644 src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/Component.java
 create mode 100644 src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/ComponentReply.java
 create mode 100644 src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/ConfigurableReply.java
 create mode 100644 src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/GlobalReplyConfig.java
 create mode 100644 src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/MessageReply.java
 delete mode 100644 src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/ModalReplyable.java
 create mode 100644 src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/Reply.java
 delete mode 100644 src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/ReplyContext.java
 delete mode 100644 src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/Replyable.java
 delete mode 100644 src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/components/Buttons.java
 delete mode 100644 src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/components/Component.java
 delete mode 100644 src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/components/SelectMenus.java
 delete mode 100644 src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/components/package-info.java
 rename src/main/java/com/github/kaktushose/jda/commands/{data => embeds}/EmbedCache.java (98%)
 rename src/main/java/com/github/kaktushose/jda/commands/{data => embeds}/EmbedDTO.java (98%)
 delete mode 100644 src/main/java/com/github/kaktushose/jda/commands/embeds/ErrorMessageFactory.java
 rename src/main/java/com/github/kaktushose/jda/commands/embeds/{ => error}/DefaultErrorMessageFactory.java (82%)
 create mode 100644 src/main/java/com/github/kaktushose/jda/commands/embeds/error/ErrorMessageFactory.java
 rename src/main/java/com/github/kaktushose/jda/commands/embeds/{ => error}/JsonErrorMessageFactory.java (72%)
 create mode 100644 src/main/java/com/github/kaktushose/jda/commands/embeds/error/package-info.java
 create mode 100644 src/main/java/com/github/kaktushose/jda/commands/internal/Helpers.java
 rename src/main/java/com/github/kaktushose/jda/commands/{ => internal}/JDAContext.java (98%)
 rename src/main/java/com/github/kaktushose/jda/commands/{data => internal/register}/CommandTree.java (96%)
 rename src/main/java/com/github/kaktushose/jda/commands/{ => internal/register}/SlashCommandUpdater.java (96%)
 rename src/main/java/com/github/kaktushose/jda/commands/{data => internal/register}/TreeNode.java (97%)
 create mode 100644 src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/ReplyConfig.java
 create mode 100644 src/main/javadoc/doc-files/flowchart.png
 create mode 100644 src/main/javadoc/overview.md
 create mode 100644 src/test/java/reply/CustomController.java
 create mode 100644 src/test/java/reply/DefaultController.java
 create mode 100644 src/test/java/reply/ReplyConfigTest.java

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index 790f78324..4824540b6 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -14,7 +14,7 @@ jobs:
           fetch-depth: 0
       - name: Generate Documentation
         run: |
-          mvn javadoc:aggregate
+          mvn javadoc:javadoc
       - name: Checkout Docs Branch
         run: |
           git checkout docs
@@ -24,8 +24,6 @@ jobs:
           rm -rf ./docs
           mv ./target/site/apidocs/ ./docs
           rm -rf ./target
-      - name: Modify search.js
-        run: echo 'getURLPrefix = function(ui) {return "";};' >> ./docs/search.js
       - name: Commit & Push Changes
         run: |
           git config --global user.email 41898282+github-actions[bot]@users.noreply.github.com
diff --git a/pom.xml b/pom.xml
index 891c26d86..f45bedc44 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,8 +36,13 @@
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <version>3.3.2</version>
                 <configuration>
-                    <source>11</source>
+                    <source>23</source>
                     <doclint>none</doclint>
+                    <overview>${basedir}/src/main/javadoc/overview.md</overview>
+                    <links>
+                        <link>https://javadoc.io/doc/net.dv8tion/JDA/5.0.2</link>
+                    </links>
+                    <docfilessubdirs>true</docfilessubdirs>
                 </configuration>
             </plugin>
             <plugin>
diff --git a/src/examples/ReportCommand.java b/src/examples/ReportCommand.java
index 4590f53c2..b6ff7bd41 100644
--- a/src/examples/ReportCommand.java
+++ b/src/examples/ReportCommand.java
@@ -23,6 +23,7 @@ public void onReportGet(CommandEvent event, Member member) {
             name = "Remove Report", usage = "{prefix}report remove @Member", desc = "Remove the reports of a user", category = "Moderation")
     public void onReportRemove(CommandEvent event, Member member) {
         event.reply("Cleared reports for member %s", member.getAsMention());
+        event.kv().put("error", error);
     }
 
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/Helpers.java b/src/main/java/com/github/kaktushose/jda/commands/Helpers.java
deleted file mode 100644
index e78e8649f..000000000
--- a/src/main/java/com/github/kaktushose/jda/commands/Helpers.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package com.github.kaktushose.jda.commands;
-
-import com.github.kaktushose.jda.commands.annotations.interactions.Permissions;
-import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
-import com.github.kaktushose.jda.commands.reflect.MethodBuildContext;
-import net.dv8tion.jda.api.entities.Guild;
-import net.dv8tion.jda.api.entities.channel.middleman.GuildChannel;
-import org.jetbrains.annotations.NotNull;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.lang.reflect.Method;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Optional;
-import java.util.Set;
-
-public final class Helpers {
-
-    private static final Logger log = LoggerFactory.getLogger(Helpers.class);
-
-    /**
-     * Sanitizes a String containing a raw mention. This will remove all markdown characters namely <em>< @ # & ! ></em>
-     * For instance: {@code <@!393843637437464588>} gets sanitized to {@code 393843637437464588}
-     *
-     * @param mention the raw String to sanitize
-     * @return the sanitized String
-     */
-    public static String sanitizeMention(@NotNull String mention) {
-        if (mention.matches("<[@#][&!]?([0-9]{4,})>")) {
-            return mention.replaceAll("<[@#][&!]?", "").replace(">", "");
-        }
-        return mention;
-    }
-
-    public static Optional<GuildChannel> resolveGuildChannel(Context context, String raw) {
-        GuildChannel guildChannel;
-        raw = sanitizeMention(raw);
-
-        Guild guild = context.getEvent().getGuild();
-        if (raw.matches("\\d+")) {
-            guildChannel = guild.getGuildChannelById(raw);
-        } else {
-            String finalRaw = raw;
-            guildChannel = guild.getChannels().stream().filter(it -> it.getName().equalsIgnoreCase(finalRaw))
-                    .findFirst().orElse(null);
-        }
-        return Optional.ofNullable(guildChannel);
-    }
-
-    public static Set<String> permissions(MethodBuildContext context) {
-        Permissions permission = context.method().getAnnotation(Permissions.class);
-
-        if (permission != null) {
-            HashSet<String> mergedPermissions = new HashSet<>(context.permissions());
-            mergedPermissions.addAll(Set.of(permission.value()));
-            return Collections.unmodifiableSet(mergedPermissions);
-        }
-        return context.permissions();
-    }
-
-    public static boolean ephemeral(MethodBuildContext context, boolean localEphemeral) {
-        return context.interaction().ephemeral() || localEphemeral;
-    }
-
-    public static boolean isIncorrectParameterType(Method method, int index, Class<?> type) {
-        if (!type.isAssignableFrom(method.getParameters()[index].getType())) {
-            log.error("An error has occurred! Skipping Interaction {}.{}:",
-                    method.getDeclaringClass().getSimpleName(),
-                    method.getName(),
-                    new IllegalArgumentException(String.format("%d. parameter must be of type %s", index + 1, type.getSimpleName())));
-            return true;
-        }
-        return false;
-    }
-
-    public static boolean isIncorrectParameterAmount(Method method, int amount) {
-        if (method.getParameters().length != amount) {
-            log.error("An error has occurred! Skipping Interaction {}.{}:",
-                    method.getDeclaringClass().getSimpleName(),
-                    method.getName(),
-                    new IllegalArgumentException(String.format(
-                            "Invalid amount of parameters!. Expected: %d Actual: %d",
-                            amount,
-                            method.getParameters().length
-                    )));
-            return true;
-        }
-        return false;
-    }
-}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/JDACommands.java b/src/main/java/com/github/kaktushose/jda/commands/JDACommands.java
index 33864f8e1..2e1346a1d 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/JDACommands.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/JDACommands.java
@@ -1,12 +1,22 @@
 package com.github.kaktushose.jda.commands;
 
+import com.github.kaktushose.jda.commands.annotations.interactions.EntitySelectMenu;
+import com.github.kaktushose.jda.commands.annotations.interactions.StringSelectMenu;
 import com.github.kaktushose.jda.commands.dependency.DefaultDependencyInjector;
 import com.github.kaktushose.jda.commands.dependency.DependencyInjector;
-import com.github.kaktushose.jda.commands.dispatching.DispatcherSupervisor;
-import com.github.kaktushose.jda.commands.dispatching.RuntimeSupervisor;
+import com.github.kaktushose.jda.commands.dispatching.ExpirationStrategy;
+import com.github.kaktushose.jda.commands.dispatching.internal.JDAEventListener;
+import com.github.kaktushose.jda.commands.dispatching.internal.Runtime;
 import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapterRegistry;
+import com.github.kaktushose.jda.commands.dispatching.handling.DispatchingContext;
 import com.github.kaktushose.jda.commands.dispatching.middleware.MiddlewareRegistry;
+import com.github.kaktushose.jda.commands.dispatching.middleware.Priority;
+import com.github.kaktushose.jda.commands.dispatching.middleware.impl.ConstraintMiddleware;
+import com.github.kaktushose.jda.commands.dispatching.middleware.impl.CooldownMiddleware;
+import com.github.kaktushose.jda.commands.dispatching.middleware.impl.PermissionsMiddleware;
 import com.github.kaktushose.jda.commands.dispatching.validation.ValidatorRegistry;
+import com.github.kaktushose.jda.commands.internal.JDAContext;
+import com.github.kaktushose.jda.commands.internal.register.SlashCommandUpdater;
 import com.github.kaktushose.jda.commands.reflect.ImplementationRegistry;
 import com.github.kaktushose.jda.commands.reflect.InteractionRegistry;
 import com.github.kaktushose.jda.commands.reflect.interactions.components.ButtonDefinition;
@@ -24,18 +34,16 @@
 
 public record JDACommands(
         JDAContext jdaContext,
-        DispatcherSupervisor dispatcherSupervisor,
+        JDAEventListener JDAEventListener,
         MiddlewareRegistry middlewareRegistry,
         TypeAdapterRegistry adapterRegistry,
         ValidatorRegistry validatorRegistry,
         DependencyInjector dependencyInjector,
         InteractionRegistry interactionRegistry,
-        SlashCommandUpdater updater,
-        RuntimeSupervisor runtimeSupervisor
-) {
+        SlashCommandUpdater updater) {
     private static final Logger log = LoggerFactory.getLogger(JDACommands.class);
 
-    private static JDACommands startInternal(Object jda, Class<?> clazz, LocalizationFunction function, DependencyInjector dependencyInjector, String... packages) {
+    private static JDACommands startInternal(Object jda, Class<?> clazz, LocalizationFunction function, DependencyInjector dependencyInjector, ExpirationStrategy expirationStrategy, String[] packages) {
         log.info("Starting JDA-Commands...");
 
         var jdaContext = new JDAContext(jda);
@@ -47,8 +55,10 @@ private static JDACommands startInternal(Object jda, Class<?> clazz, Localizatio
         var implementationRegistry = new ImplementationRegistry(dependencyInjector, middlewareRegistry, adapterRegistry, validatorRegistry);
         var interactionRegistry = new InteractionRegistry(validatorRegistry, dependencyInjector, function);
 
-        var runtimeSupervisor = new RuntimeSupervisor(dependencyInjector);
-        var dispatcherSupervisor = new DispatcherSupervisor(middlewareRegistry, implementationRegistry, interactionRegistry, adapterRegistry, runtimeSupervisor);
+        middlewareRegistry.register(Priority.PERMISSIONS, new PermissionsMiddleware(implementationRegistry));
+        middlewareRegistry.register(Priority.NORMAL, new ConstraintMiddleware(implementationRegistry), new CooldownMiddleware(implementationRegistry));
+
+        var eventListener = new JDAEventListener(new DispatchingContext(middlewareRegistry, implementationRegistry, interactionRegistry, adapterRegistry, expirationStrategy));
 
         implementationRegistry.index(clazz, packages);
 
@@ -57,20 +67,19 @@ private static JDACommands startInternal(Object jda, Class<?> clazz, Localizatio
         var updater = new SlashCommandUpdater(jdaContext, implementationRegistry.getGuildScopeProvider(), interactionRegistry);
         updater.updateAllCommands();
 
-        jdaContext.performTask(it -> it.addEventListener(dispatcherSupervisor));
+        jdaContext.performTask(it -> it.addEventListener(eventListener));
 
         log.info("Finished loading!");
 
         return new JDACommands(
                 jdaContext,
-                dispatcherSupervisor,
+                eventListener,
                 middlewareRegistry,
                 adapterRegistry,
                 validatorRegistry,
                 dependencyInjector,
                 interactionRegistry,
-                updater,
-                runtimeSupervisor
+                updater
         );
     }
 
@@ -83,7 +92,7 @@ private static JDACommands startInternal(Object jda, Class<?> clazz, Localizatio
      * @return a new JDACommands instance
      */
     public static JDACommands start(@NotNull JDA jda, @NotNull Class<?> clazz, @NotNull String... packages) {
-        return startInternal(jda, clazz, ResourceBundleLocalizationFunction.empty().build(), new DefaultDependencyInjector(), packages);
+        return startInternal(jda, clazz, ResourceBundleLocalizationFunction.empty().build(), new DefaultDependencyInjector(), ExpirationStrategy.AFTER_15_MINUTES, packages);
     }
 
     /**
@@ -95,7 +104,7 @@ public static JDACommands start(@NotNull JDA jda, @NotNull Class<?> clazz, @NotN
      * @return a new JDACommands instance
      */
     public static JDACommands start(@NotNull ShardManager shardManager, @NotNull Class<?> clazz, @NotNull String... packages) {
-        return startInternal(shardManager, clazz, ResourceBundleLocalizationFunction.empty().build(), new DefaultDependencyInjector(), packages);
+        return startInternal(shardManager, clazz, ResourceBundleLocalizationFunction.empty().build(), new DefaultDependencyInjector(), ExpirationStrategy.AFTER_15_MINUTES, packages);
     }
 
     /**
@@ -108,7 +117,7 @@ public static JDACommands start(@NotNull ShardManager shardManager, @NotNull Cla
      * @return a new JDACommands instance
      */
     public static JDACommands start(@NotNull JDA jda, @NotNull Class<?> clazz, LocalizationFunction function, @NotNull String... packages) {
-        return startInternal(jda, clazz, function, new DefaultDependencyInjector(), packages);
+        return startInternal(jda, clazz, function, new DefaultDependencyInjector(), ExpirationStrategy.AFTER_15_MINUTES, packages);
     }
 
     /**
@@ -121,7 +130,7 @@ public static JDACommands start(@NotNull JDA jda, @NotNull Class<?> clazz, Local
      * @return a new JDACommands instance
      */
     public static JDACommands start(@NotNull ShardManager shardManager, @NotNull Class<?> clazz, LocalizationFunction function, @NotNull String... packages) {
-        return startInternal(shardManager, clazz, function, new DefaultDependencyInjector(), packages);
+        return startInternal(shardManager, clazz, function, new DefaultDependencyInjector(), ExpirationStrategy.AFTER_15_MINUTES, packages);
     }
 
     /**
@@ -134,8 +143,8 @@ public static JDACommands start(@NotNull ShardManager shardManager, @NotNull Cla
      * @param packages package(s) to exclusively scan
      * @return a new JDACommands instance
      */
-    public static JDACommands start(@NotNull JDA jda, @NotNull Class<?> clazz, LocalizationFunction function, DependencyInjector injector, @NotNull String... packages) {
-        return startInternal(jda, clazz, function, injector, packages);
+    public static JDACommands start(@NotNull JDA jda, @NotNull Class<?> clazz, LocalizationFunction function, DependencyInjector injector, ExpirationStrategy expirationStrategy, @NotNull String... packages) {
+        return startInternal(jda, clazz, function, injector, expirationStrategy, packages);
     }
 
     /**
@@ -148,8 +157,8 @@ public static JDACommands start(@NotNull JDA jda, @NotNull Class<?> clazz, Local
      * @param packages     package(s) to exclusively scan
      * @return a new JDACommands instance
      */
-    public static JDACommands start(@NotNull ShardManager shardManager, @NotNull Class<?> clazz, LocalizationFunction function, DependencyInjector injector, @NotNull String... packages) {
-        return startInternal(shardManager, clazz, function, injector, packages);
+    public static JDACommands start(@NotNull ShardManager shardManager, @NotNull Class<?> clazz, LocalizationFunction function, DependencyInjector injector, ExpirationStrategy expirationStrategy, @NotNull String... packages) {
+        return startInternal(shardManager, clazz, function, injector, expirationStrategy, packages);
     }
 
     /**
@@ -157,7 +166,7 @@ public static JDACommands start(@NotNull ShardManager shardManager, @NotNull Cla
      * This will <b>not</b> unregister any slash commands.
      */
     public void shutdown() {
-        jdaContext.performTask(jda -> jda.removeEventListener(dispatcherSupervisor));
+        jdaContext.performTask(jda -> jda.removeEventListener(JDAEventListener));
     }
 
     /**
@@ -169,19 +178,16 @@ public void updateGuildCommands() {
         updater.updateGuildCommands();
     }
 
-    /**
-     * Gets a JDA {@link Button} to use it for message builders based on the jda-commands id.
-     *
-     * <p>
-     * The id is made up of the simple class name and the method name. E.g. the id of a button defined by a
-     * {@code onButton(ComponentEvent event)} method inside an {@code ExampleButton} class would be
-     * {@code ExampleButton.onButton}.
-     * </p>
-     *
-     * @param button the id of the button
-     * @return a JDA {@link Button}
-     */
-    public Button getButton(String button) {
+    /// Gets a [`Button`][com.github.kaktushose.jda.commands.annotations.interactions.Button] based on the method name
+    /// and transforms it into a JDA [Button].
+    ///
+    /// The button will be [`Runtime`]({@docRoot}/index.html#runtime-concept-heading) independent. This may be useful if you want to send a message without
+    /// using the framework.
+    ///
+    /// @param button the name of the button
+    /// @return the JDA [Button]
+    @NotNull
+    public Button getButton(@NotNull String button) {
         if (!button.matches("[a-zA-Z]+\\.[a-zA-Z]+")) {
             throw new IllegalArgumentException("Unknown Button");
         }
@@ -191,95 +197,29 @@ public Button getButton(String button) {
                 .filter(it -> it.getDefinitionId().equals(sanitizedId))
                 .findFirst().orElseThrow(() -> new IllegalArgumentException("Unknown Button"));
 
-        RuntimeSupervisor.InteractionRuntime runtime = runtimeSupervisor.newRuntime(buttonDefinition);
-        return buttonDefinition.toButton().withId(buttonDefinition.createCustomId(runtime.getRuntimeId()));
+        return buttonDefinition.toButton().withId(buttonDefinition.independentCustomId());
     }
 
-    /**
-     * Gets a JDA {@link Button} to use it for message builders based on the jda-commands id and links it an
-     * existing
-     * {@link com.github.kaktushose.jda.commands.dispatching.RuntimeSupervisor.InteractionRuntime InteractionRuntime}.
-     *
-     *
-     * <p>
-     * The id is made up of the simple class name and the method name. E.g. the id of a button defined by a
-     * {@code onButton(ComponentEvent event)} method inside an {@code ExampleButton} class would be
-     * {@code ExampleButton.onButton}.
-     * </p>
-     *
-     * @param button    the id of the button
-     * @param runtimeId the id of the
-     *                  {@link com.github.kaktushose.jda.commands.dispatching.RuntimeSupervisor.InteractionRuntime InteractionRuntime}
-     * @return a JDA {@link Button}
-     */
-    public Button getButton(String button, String runtimeId) {
-        if (!button.matches("[a-zA-Z]+\\.[a-zA-Z]+")) {
-            throw new IllegalArgumentException("Unknown Button");
-        }
-
-        String sanitizedId = button.replaceAll("\\.", "");
-        ButtonDefinition buttonDefinition = interactionRegistry.getButtons().stream()
-                .filter(it -> it.getDefinitionId().equals(sanitizedId))
-                .findFirst().orElseThrow(() -> new IllegalArgumentException("Unknown Button"));
-
-        return buttonDefinition.toButton().withId(buttonDefinition.createCustomId(runtimeId));
-    }
-
-    /**
-     * Gets a JDA {@link SelectMenu} to use it for message builders based on the jda-commands id.
-     *
-     * <p>
-     * The id is made up of the simple class name and the method name. E.g. the id of a a select menu defined by a
-     * {@code onSelectMenu(ComponentEvent event)} method inside an {@code ExampleMenu} class would be
-     * {@code ExampleMenu.onSelectMenu}.
-     * </p>
-     *
-     * @param selectMenu the id of the selectMenu
-     * @return a JDA {@link SelectMenu}
-     */
-    @SuppressWarnings("unchecked")
-    public <T extends SelectMenu> T getSelectMenu(String selectMenu) {
-        if (!selectMenu.matches("[a-zA-Z]+\\.[a-zA-Z]+")) {
-            throw new IllegalArgumentException("Unknown Select Menu");
-        }
-
-        String sanitizedId = selectMenu.replaceAll("\\.", "");
-        GenericSelectMenuDefinition<?> selectMenuDefinition = interactionRegistry.getSelectMenus().stream()
-                .filter(it -> it.getDefinitionId().equals(sanitizedId))
-                .findFirst().orElseThrow(() -> new IllegalArgumentException("Unknown Select Menu"));
-
-        RuntimeSupervisor.InteractionRuntime runtime = runtimeSupervisor.newRuntime(selectMenuDefinition);
-        return (T) selectMenuDefinition.toSelectMenu(runtime.getRuntimeId(), true);
-    }
-
-    /**
-     * Gets a JDA {@link SelectMenu} subtype to use it for message builders based on the jda-commands id and links it an
-     * existing
-     * {@link com.github.kaktushose.jda.commands.dispatching.RuntimeSupervisor.InteractionRuntime InteractionRuntime}.
-     *
-     * <p>
-     * The id is made up of the simple class name and the method name. E.g. the id of a select menu defined by a
-     * {@code onSelectMenu(ComponentEvent event)} method inside an {@code ExampleMenu} class would be
-     * {@code ExampleMenu.onSelectMenu}.
-     * </p>
-     *
-     * @param selectMenu the id of the selectMenu
-     * @param runtimeId  the id of the
-     *                   {@link com.github.kaktushose.jda.commands.dispatching.RuntimeSupervisor.InteractionRuntime
-     *                   InteractionRuntime}
-     * @return a JDA {@link SelectMenu}
-     */
+    /// Gets a [StringSelectMenu] or [EntitySelectMenu] based on the method name and transforms it into a JDA [SelectMenu].
+    ///
+    /// The select menu will be [`Runtime`]({@docRoot}/index.html#runtime-concept-heading) independent. This may be useful if you want to send a component
+    /// without using the framework.
+    ///
+    /// @param <S>  the type of [SelectMenu]
+    /// @param menu the name of the select menu
+    /// @return the JDA [SelectMenu]
     @SuppressWarnings("unchecked")
-    public <T extends SelectMenu> T getSelectMenu(String selectMenu, String runtimeId) {
-        if (!selectMenu.matches("[a-zA-Z]+\\.[a-zA-Z]+")) {
+    @NotNull
+    public <S extends SelectMenu> S getSelectMenu(@NotNull String menu) {
+        if (!menu.matches("[a-zA-Z]+\\.[a-zA-Z]+")) {
             throw new IllegalArgumentException("Unknown Select Menu");
         }
 
-        String sanitizedId = selectMenu.replaceAll("\\.", "");
+        String sanitizedId = menu.replaceAll("\\.", "");
         GenericSelectMenuDefinition<?> selectMenuDefinition = interactionRegistry.getSelectMenus().stream()
                 .filter(it -> it.getDefinitionId().equals(sanitizedId))
                 .findFirst().orElseThrow(() -> new IllegalArgumentException("Unknown Select Menu"));
 
-        return (T) selectMenuDefinition.toSelectMenu(runtimeId, true);
+        return (S) selectMenuDefinition.toSelectMenu(selectMenuDefinition.independentCustomId(), true);
     }
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/annotations/Implementation.java b/src/main/java/com/github/kaktushose/jda/commands/annotations/Implementation.java
index 9c30866ab..99aedd334 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/annotations/Implementation.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/annotations/Implementation.java
@@ -2,6 +2,7 @@
 
 import com.github.kaktushose.jda.commands.annotations.constraints.Constraint;
 import com.github.kaktushose.jda.commands.dispatching.middleware.Priority;
+import com.github.kaktushose.jda.commands.embeds.error.ErrorMessageFactory;
 
 import java.lang.annotation.*;
 
@@ -14,7 +15,7 @@
  * @see com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapter TypeAdapter
  * @see com.github.kaktushose.jda.commands.permissions.PermissionsProvider PermissionsProvider
  * @see com.github.kaktushose.jda.commands.scope.GuildScopeProvider GuildScopeProvider
- * @see com.github.kaktushose.jda.commands.embeds.ErrorMessageFactory ErrorMessageFactory
+ * @see ErrorMessageFactory ErrorMessageFactory
  * @since 2.0.0
  */
 @Target(ElementType.TYPE)
@@ -34,7 +35,7 @@
 
     /**
      * Gets the annotation the {@link com.github.kaktushose.jda.commands.dispatching.validation.Validator Validator}
-     * should be mapped to. If the component is not a subtype of
+     * should be mapped to. If this class is not a subtype of
      * {@link com.github.kaktushose.jda.commands.dispatching.validation.Validator Validator}, this field can be ignored.
      *
      * @return the annotation the {@link com.github.kaktushose.jda.commands.dispatching.validation.Validator Validator}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/AutoComplete.java b/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/AutoComplete.java
index c31b37244..5af595b39 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/AutoComplete.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/AutoComplete.java
@@ -1,18 +1,31 @@
 package com.github.kaktushose.jda.commands.annotations.interactions;
 
 
+import com.github.kaktushose.jda.commands.dispatching.events.interactions.AutoCompleteEvent;
+
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-/**
- * Methods annotated with AutoComplete will be registered as a handler for
- * {@link com.github.kaktushose.jda.commands.dispatching.interactions.autocomplete.AutoCompleteEvent AutoCompleteEvents}.
- *
- * @see SlashCommand
- * @since 4.0.0
- */
+/// Methods annotated with AutoComplete will be registered as a handler for [AutoCompleteEvent]s for the given
+/// [SlashCommand](s).
+///
+/// ## Example:
+/// ```
+/// @SlashCommand(value = "favourite fruit")
+/// public void fruitCommand(CommandEvent event, String fruit) {
+///     event.reply("You've chosen: %s", fruit);
+/// }
+///
+/// @AutoComplete("fruitCommand")
+/// public void onFruitAutoComplete(AutoCompleteEvent event) {
+///     event.replyChoices(...);
+/// }
+/// ```
+///
+/// @see SlashCommand
+/// @since 4.0.0
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)
 public @interface AutoComplete {
diff --git a/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Button.java b/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Button.java
index 669a90ea5..8d51a4073 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Button.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Button.java
@@ -1,5 +1,8 @@
 package com.github.kaktushose.jda.commands.annotations.interactions;
 
+import com.github.kaktushose.jda.commands.dispatching.events.interactions.ComponentEvent;
+import com.github.kaktushose.jda.commands.dispatching.reply.Component;
+import com.github.kaktushose.jda.commands.dispatching.reply.ConfigurableReply;
 import net.dv8tion.jda.api.entities.emoji.Emoji;
 import net.dv8tion.jda.api.interactions.components.buttons.ButtonStyle;
 
@@ -8,20 +11,24 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-/**
- * Methods annotated with Button will be registered as a button at startup.
- *
- * <p>Therefore the method must be declared inside a class that is annotated with
- * {@link Interaction}.
- * Furthermore, the method signature has to meet the following conditions:
- * <ul>
- * <li>First parameter must be of type
- * {@link com.github.kaktushose.jda.commands.dispatching.interactions.components.ComponentEvent ComponentEvent}</li>
- * </ul>
- *
- * @see Interaction
- * @since 2.3.0
- */
+/// Methods annotated with [Button] will be registered as a button at startup.
+///
+/// Therefore, the method must be declared inside a class that is annotated with
+/// [Interaction].
+/// Furthermore, the method signature has to meet the following conditions:
+///
+///   - First parameter must be of type [ComponentEvent]
+///
+/// You can reply with a button by calling [ConfigurableReply#components(Component...)].
+///
+/// ## Example:
+/// ```
+/// @Button(value = "Press me", style = ButtonStyle.DANGER)
+/// public void onButton(ComponentEvent event) { ... }
+/// ```
+///
+/// @see Interaction
+/// @since 2.3.0
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)
 public @interface Button {
@@ -54,11 +61,4 @@
      */
     String link() default "";
 
-    /**
-     * Whether this button should send ephemeral replies by default.
-     *
-     * @return {@code true} if to send ephemeral replies
-     */
-    boolean ephemeral() default false;
-
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Choices.java b/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Choices.java
index 1d0473c88..bc04a52c3 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Choices.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Choices.java
@@ -8,6 +8,7 @@
 /**
  * Annotation used to add choices to parameters.
  *
+ * @see SlashCommand
  * @since 2.3.0
  */
 @Target(ElementType.PARAMETER)
diff --git a/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/ContextCommand.java b/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/ContextCommand.java
index 5dbf518d9..602081004 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/ContextCommand.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/ContextCommand.java
@@ -1,7 +1,9 @@
 package com.github.kaktushose.jda.commands.annotations.interactions;
 
-import com.github.kaktushose.jda.commands.dispatching.interactions.commands.CommandEvent;
+import com.github.kaktushose.jda.commands.dispatching.events.interactions.CommandEvent;
 import net.dv8tion.jda.api.Permission;
+import net.dv8tion.jda.api.entities.Message;
+import net.dv8tion.jda.api.entities.User;
 import net.dv8tion.jda.api.interactions.commands.Command;
 
 import java.lang.annotation.ElementType;
@@ -9,19 +11,26 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-/**
- * Methods annotated with ContextMenu will be registered as a context menu command.
- *
- * <p>Therefore the method must be declared inside a class that is annotated with
- * {@link Interaction}.
- * Furthermore, the method signature has to meet the following conditions:
- * <ul>
- * <li>First parameter must be of type {@link CommandEvent}</li>
- * </ul>
- *
- * @see Interaction
- * @since 4.0.0
- */
+/// Methods annotated with ContextMenu will be registered as a context menu command.
+///
+/// Therefore, the method must be declared inside a class that is annotated with
+/// [Interaction].
+/// Furthermore, the method signature has to meet the following conditions:
+///
+///   - First parameter must be of type [CommandEvent]
+///   - Second parameter must either be a [User] or a [Message]
+///
+/// ## Examples:
+/// ```
+/// @ContextCommand(value = "message context command", type = Command.Type.MESSAGE)
+/// public void onCommand(CommandEvent event, Message target) { ... }
+///
+/// @ContextCommand(value = "user context command", type = Command.Type.USER)
+/// public void onCommand(CommandEvent event, User target) { ... }
+/// ```
+///
+/// @see Interaction
+/// @since 4.0.0
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)
 public @interface ContextCommand {
@@ -48,14 +57,6 @@
      */
     boolean isNSFW() default false;
 
-    /**
-     * Returns whether this command should send ephemeral replies by default. Note that {@link Interaction#ephemeral()}
-     * set to {@code true} will override this value.
-     *
-     * @return {@code true} if this command should send ephemeral replies
-     */
-    boolean ephemeral() default false;
-
     /**
      * Returns an array of {@link net.dv8tion.jda.api.Permission Permissions} this command
      * should be enabled for by default. Note that guild admins can modify this at any time.
diff --git a/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/EntitySelectMenu.java b/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/EntitySelectMenu.java
index 154af061f..5a68978fc 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/EntitySelectMenu.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/EntitySelectMenu.java
@@ -1,6 +1,9 @@
 package com.github.kaktushose.jda.commands.annotations.interactions;
 
-import com.github.kaktushose.jda.commands.dispatching.interactions.components.ComponentEvent;
+import com.github.kaktushose.jda.commands.dispatching.events.interactions.ComponentEvent;
+import com.github.kaktushose.jda.commands.dispatching.reply.Component;
+import com.github.kaktushose.jda.commands.dispatching.reply.ConfigurableReply;
+import net.dv8tion.jda.api.entities.Mentions;
 import net.dv8tion.jda.api.entities.channel.ChannelType;
 import net.dv8tion.jda.api.interactions.components.selections.EntitySelectMenu.SelectTarget;
 
@@ -9,20 +12,24 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-/**
- * Methods annotated with EntitySelectMenu will be registered as a EntitySelectMenu at startup.
- *
- * <p>Therefore the method must be declared inside a class that is annotated with
- * {@link Interaction}.
- * Furthermore, the method signature has to meet the following conditions:
- * <ul>
- * <li>First parameter must be of type
- * {@link ComponentEvent SelectMenuEvent}</li>
- * </ul>
- *
- * @see Interaction
- * @since 2.3.0
- */
+/// Methods annotated with EntitySelectMenu will be registered as a EntitySelectMenu at startup.
+///
+/// Therefore, the method must be declared inside a class that is annotated with
+/// [Interaction].
+/// Furthermore, the method signature has to meet the following conditions:
+///
+///   - First parameter must be of type [ComponentEvent]
+///   - Second parameter must be of type [Mentions]
+///
+/// You can reply with an entity select menu by calling [ConfigurableReply#components(Component...)].
+///
+/// ## Example:
+/// ```
+/// @EntitySelectMenu(value = SelectTarget.USER, placeholder = "Who's your favourite user?")
+/// public void onMenu(ComponentEvent event, Mentions mentions) { ... }
+/// ```
+/// @see Interaction
+/// @since 2.3.0
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)
 public @interface EntitySelectMenu {
@@ -93,11 +100,4 @@
      */
     int maxValue() default 1;
 
-    /**
-     * Whether this button should send ephemeral replies by default.
-     *
-     * @return {@code true} if to send ephemeral replies
-     */
-    boolean ephemeral() default false;
-
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Interaction.java b/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Interaction.java
index 608b708b7..32c010799 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Interaction.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Interaction.java
@@ -5,12 +5,25 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-/**
- * Classes annotated with Interaction will be scanned at startup and are eligible for defining interactions such as
- * slash commands, buttonContainers, modals or context menus.
- *
- * @since 4.0.0
- */
+/// Classes annotated with [Interaction] are responsible for defining and handling interactions.
+///
+/// A class annotated with [Interaction] can define interactions via its methods. Therefore, such methods must be annotated
+/// with one of the following interaction annotations: [SlashCommand], [ContextCommand], [Button], [EntitySelectMenu],
+/// [StringSelectMenu] or [Modal]. See the respective annotations for details.
+///
+/// ## Example:
+/// ```
+/// @Interaction
+/// public class InteractionClass {
+///
+///     @SlashCommand("greet")
+///     public void onCommand(CommandEvent event) {
+///         event.reply("Hello World!");
+///     }
+/// }
+/// ```
+///
+/// @since 4.0.0
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)
 public @interface Interaction {
@@ -22,11 +35,4 @@
      */
     String value() default "";
 
-    /**
-     * Returns whether this interaction should send ephemeral replies by default.
-     *
-     * @return {@code true} if this interaction should send ephemeral replies by default
-     */
-    boolean ephemeral() default false;
-
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Modal.java b/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Modal.java
index 6c64c6963..a9d86b105 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Modal.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Modal.java
@@ -1,20 +1,28 @@
 package com.github.kaktushose.jda.commands.annotations.interactions;
 
+import com.github.kaktushose.jda.commands.dispatching.events.ModalReplyableEvent;
+
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-/**
- * Methods annotated with Modal will be registered as a modal at startup.
- *
- * <p>Therefore the method must be declared inside a class that is annotated with
- * {@link Interaction}.
- *
- * @see Interaction
- * @see TextInput
- * @since 4.0.0
- */
+/// Methods annotated with [Modal] will be registered as a modal at startup.
+///
+/// Therefore, the method must be declared inside a class that is annotated with
+/// [Interaction]. Text inputs are defined via method parameters that must be annotated with [TextInput].
+///
+/// You can reply with a modal by calling [ModalReplyableEvent#replyModal(String)].
+///
+/// ## Example:
+/// ```
+/// @Modal("My Modal")
+/// public void onModal(ModalEvent event, @TextInput("Type here") String input) { ... }
+/// ```
+///
+/// @see Interaction
+/// @see TextInput
+/// @since 4.0.0
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)
 public @interface Modal {
@@ -26,11 +34,4 @@
      */
     String value();
 
-    /**
-     * Whether this Modal should send ephemeral replies by default.
-     *
-     * @return {@code true} if to send ephemeral replies
-     */
-    boolean ephemeral() default false;
-
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Optional.java b/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Optional.java
index 3b78a39c5..0e5fc05b6 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Optional.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Optional.java
@@ -17,6 +17,7 @@
  * will try to parse it. If the parsing fails the command will still be executed but with empty or
  * possible {@code null} values.
  *
+ * @see SlashCommand
  * @since 1.0.0
  */
 @Target(ElementType.PARAMETER)
diff --git a/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/ReplyConfig.java b/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/ReplyConfig.java
new file mode 100644
index 000000000..d624a0b74
--- /dev/null
+++ b/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/ReplyConfig.java
@@ -0,0 +1,63 @@
+package com.github.kaktushose.jda.commands.annotations.interactions;
+
+import com.github.kaktushose.jda.commands.dispatching.events.ReplyableEvent;
+import com.github.kaktushose.jda.commands.dispatching.reply.ConfigurableReply;
+import com.github.kaktushose.jda.commands.dispatching.reply.GlobalReplyConfig;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/// Used to configure the reply behaviour of interaction replies.
+///
+/// Interaction methods annotated with [ReplyConfig] will use the configured values of this annotation when sending a reply.
+/// Interaction classes annotated with [ReplyConfig] will apply the configured values of this annotation to
+/// every method, if and only if no annotation is present at method level. If the [ReplyConfig] annotation is neither
+/// present at the class level nor the method level, the [GlobalReplyConfig] will be used instead.
+///
+/// **These values are always overridden by [ConfigurableReply#ephemeral(boolean)],
+/// [ConfigurableReply#keepComponents(boolean)] or respectively [ConfigurableReply#editReply(boolean)].**
+///
+/// In other words the hierarchy is as following:
+/// 1. [ConfigurableReply]
+/// 2. [ReplyConfig] method annotation
+/// 3. [ReplyConfig] class annotation
+/// 4. [GlobalReplyConfig]
+///
+/// @see ReplyableEvent
+/// @since 4.0.0
+@Target({ElementType.TYPE, ElementType.METHOD})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface ReplyConfig {
+
+    /// Whether to send ephemeral replies. Default value is `false`.
+    ///
+    /// Ephemeral messages have some limitations and will be removed once the user restarts their client.
+    /// Limitations:
+    /// - Cannot contain any files/ attachments
+    /// - Cannot be reacted to
+    /// - Cannot be retrieved
+    ///
+    /// @return `true` if to send ephemeral replies
+    boolean ephemeral() default false;
+
+    /// Whether to keep the original components when editing a message. Default value is `true`.
+    ///
+    /// More formally, if editing a message and `keepComponents` is `true`, the original message will first be queried and
+    /// its components get added to the reply before it is sent.
+    ///
+    /// @return `true` if to keep the original components
+    boolean keepComponents() default true;
+
+    /// Whether to edit the original message or to send a new one. Default value is `true`.
+    ///
+    /// The original message is the message, from which this event (interaction) originates.
+    /// For example if this event is a ButtonEvent, the original message will be the message to which the pressed button is attached to.
+    ///
+    /// Subsequent replies to the same slash command event or the button event cannot be edited.
+    ///
+    /// @return `true` if to edit the original method
+    boolean editReply() default true;
+
+}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/SelectOption.java b/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/SelectOption.java
index 57916f842..de03b476e 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/SelectOption.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/SelectOption.java
@@ -9,7 +9,6 @@
  * Used to define {@link net.dv8tion.jda.api.interactions.components.selections.SelectOption SelectOptions}
  * for {@link StringSelectMenu StringSelectMenus}.
  *
- * @see Interaction
  * @see StringSelectMenu
  * @since 4.0.0
  */
diff --git a/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/SlashCommand.java b/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/SlashCommand.java
index 8a5792b05..177f3786d 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/SlashCommand.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/SlashCommand.java
@@ -1,6 +1,7 @@
 package com.github.kaktushose.jda.commands.annotations.interactions;
 
-import com.github.kaktushose.jda.commands.dispatching.interactions.commands.CommandEvent;
+import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapterRegistry;
+import com.github.kaktushose.jda.commands.dispatching.events.interactions.CommandEvent;
 import net.dv8tion.jda.api.Permission;
 
 import java.lang.annotation.ElementType;
@@ -8,24 +9,39 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-/**
- * Methods annotated with SlashCommand will be registered as a slash command at startup.
- *
- * <p>Therefore the method must be declared inside a class that is annotated with {@link Interaction}.
- * Furthermore, the method signature has to meet the following conditions:
- * <ul>
- * <li>First parameter must be of type {@link CommandEvent}</li>
- * <li>Remaining parameter types must be registered at the
- * {@link com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapterRegistry TypeAdapterRegistry} or be a
- * String array</li>
- * <li>Parameter constraints must be valid</li>
- * </ul>
- *
- * @see Interaction
- * @see com.github.kaktushose.jda.commands.annotations.interactions.Interaction Interaction
- * @see com.github.kaktushose.jda.commands.annotations.constraints.Constraint Constraint
- * @since 1.0.0
- */
+/// Methods annotated with SlashCommand will be registered as a slash command at startup.
+///
+/// Therefore, the method must be declared inside a class that is annotated with [Interaction].
+/// Furthermore, the method signature has to meet the following conditions:
+///
+///   - First parameter must be of type [CommandEvent]
+///   - Remaining parameter types must be registered at the [TypeAdapterRegistry]
+///   - or the second parameter is a String array
+///
+/// ## Examples:
+/// ```
+/// @SlashCommand("greet")
+/// public void onCommand(CommandEvent event) {
+///     event.reply("Hello World!");
+/// }
+///
+/// @SlashCommand(value="moderation ban", desc="Bans a member", enabledFor=Permission.BAN_MEMBERS)
+/// public void onCommand(CommandEvent event, @Param("The member to ban") Member target, @Optional("no reason given") String reason) { ... }
+///
+/// @SlashCommand(value = "favourite fruit")
+/// public void onCommand(CommandEvent event, @Choices({"Apple", "Banana", "Orange"}) String fruit) {
+///     event.reply("You've chosen: %s", fruit);
+/// }
+///
+/// @SlashCommand("example command") {
+/// public void onCommand(CommandEvent event, String[] arguments) {}
+/// }
+/// ```
+///
+/// @see Interaction
+/// @see com.github.kaktushose.jda.commands.annotations.interactions.Interaction Interaction
+/// @see com.github.kaktushose.jda.commands.annotations.constraints.Constraint Constraint
+/// @since 1.0.0
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)
 public @interface SlashCommand {
@@ -59,14 +75,6 @@
      */
     boolean isNSFW() default false;
 
-    /**
-     * Returns whether this command should send ephemeral replies by default. Note that {@link Interaction#ephemeral()}
-     * set to {@code true} will override this value.
-     *
-     * @return {@code true} if this command should send ephemeral replies
-     */
-    boolean ephemeral() default false;
-
     /**
      * Returns an array of {@link net.dv8tion.jda.api.Permission Permissions} this command
      * should be enabled for by default. Note that guild admins can modify this at any time.
diff --git a/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/StaticInstance.java b/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/StaticInstance.java
deleted file mode 100644
index 702ee2c05..000000000
--- a/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/StaticInstance.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.github.kaktushose.jda.commands.annotations.interactions;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Marker interface to indicate that an {@link Interaction} class should use one static instance instead of
- * request-scoped instances.
- *
- * @since 4.0.0
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface StaticInstance {
-}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/StringSelectMenu.java b/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/StringSelectMenu.java
index 4617d1226..688f622a6 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/StringSelectMenu.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/StringSelectMenu.java
@@ -1,27 +1,37 @@
 package com.github.kaktushose.jda.commands.annotations.interactions;
 
-import com.github.kaktushose.jda.commands.dispatching.interactions.components.ComponentEvent;
+import com.github.kaktushose.jda.commands.dispatching.events.interactions.ComponentEvent;
+import com.github.kaktushose.jda.commands.dispatching.reply.Component;
+import com.github.kaktushose.jda.commands.dispatching.reply.ConfigurableReply;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+import java.util.List;
 
-/**
- * Methods annotated with StringSelectMenu will be registered as a StringSelectMenu at startup.
- *
- * <p>Therefore the method must be declared inside a class that is annotated with
- * {@link Interaction}.
- * Furthermore, the method signature has to meet the following conditions:
- * <ul>
- * <li>First parameter must be of type
- * {@link ComponentEvent SelectMenuEvent}</li>
- * </ul>
- *
- * @see Interaction
- * @see SelectOption
- * @since 4.0.0
- */
+/// Methods annotated with StringSelectMenu will be registered as a StringSelectMenu at startup.
+///
+/// Therefore, the method must be declared inside a class that is annotated with
+/// [Interaction].
+/// Furthermore, the method signature has to meet the following conditions:
+///
+///   - First parameter must be of type [ComponentEvent]
+///   - Second parameter must be of type [`List<String>`][List]
+///
+/// You can reply with a string select menu by calling [ConfigurableReply#components(Component...)].
+///
+/// ## Example:
+/// ```
+/// @SelectOption(label= "Pizza", value = "pizza")
+/// @SelectOption(label= "Hamburger", value = "hamburger")
+/// @SelectOption(label= "Sushi", value = "Sushi")
+/// @StringSelectMenu("What's your favourite food?")
+/// public void onMenu(ComponentEvent event, List<String> choices) { ... }
+/// ```
+/// @see Interaction
+/// @see SelectOption
+/// @since 4.0.0
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)
 public @interface StringSelectMenu {
@@ -31,7 +41,7 @@
      *
      * @return the placeholder which is displayed when no selections have been made yet
      */
-    String value() default "";
+    String value();
 
     /**
      * The minimum amount of values a user has to select.
@@ -53,10 +63,4 @@
      */
     int maxValue() default 1;
 
-    /**
-     * Whether this button should send ephemeral replies by default.
-     *
-     * @return {@code true} if to send ephemeral replies
-     */
-    boolean ephemeral() default false;
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/TextInput.java b/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/TextInput.java
index 7ca0b484f..c1de71bc1 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/TextInput.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/TextInput.java
@@ -10,6 +10,7 @@
 /**
  * Annotation used to add TextInputs to {@link Modal Modals}.
  *
+ * @see Modal
  * @since 4.0.0
  */
 @Target(ElementType.PARAMETER)
@@ -17,19 +18,19 @@
 public @interface TextInput {
 
     /**
-     * The label shown above this text input box
+     * The placeholder of this TextInput
+     * <br>This is the short hint that describes the expected value of the TextInput field.
      *
-     * @return Label for the input
+     * @return Placeholder
      */
-    String label() default "";
+    String value();
 
     /**
-     * The placeholder of this TextInput
-     * <br>This is the short hint that describes the expected value of the TextInput field.
+     * The label shown above this text input box
      *
-     * @return Placeholder
+     * @return Label for the input
      */
-    String value() default "";
+    String label() default "";
 
     /**
      * The default value of this TextInput.
diff --git a/src/main/java/com/github/kaktushose/jda/commands/data/package-info.java b/src/main/java/com/github/kaktushose/jda/commands/data/package-info.java
deleted file mode 100644
index fc2d5c455..000000000
--- a/src/main/java/com/github/kaktushose/jda/commands/data/package-info.java
+++ /dev/null
@@ -1,4 +0,0 @@
-/**
- * The data persistence and sorting features of JDA-Commands.
- */
-package com.github.kaktushose.jda.commands.data;
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dependency/package-info.java b/src/main/java/com/github/kaktushose/jda/commands/dependency/package-info.java
index 8ca174c45..cf6192e8b 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dependency/package-info.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dependency/package-info.java
@@ -1,4 +1,4 @@
 /**
- * The Dependency Injection feature of JDA-Commands.
+ * The Dependency Injection feature of jda-commands.
  */
 package com.github.kaktushose.jda.commands.dependency;
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/DispatcherSupervisor.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/DispatcherSupervisor.java
deleted file mode 100644
index 1eba503bc..000000000
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/DispatcherSupervisor.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package com.github.kaktushose.jda.commands.dispatching;
-
-import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapterRegistry;
-import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
-import com.github.kaktushose.jda.commands.dispatching.interactions.GenericDispatcher;
-import com.github.kaktushose.jda.commands.dispatching.interactions.autocomplete.AutoCompleteDispatcher;
-import com.github.kaktushose.jda.commands.dispatching.interactions.commands.CommandDispatcher;
-import com.github.kaktushose.jda.commands.dispatching.interactions.commands.SlashCommandContext;
-import com.github.kaktushose.jda.commands.dispatching.interactions.components.ComponentDispatcher;
-import com.github.kaktushose.jda.commands.dispatching.interactions.modals.ModalDispatcher;
-import com.github.kaktushose.jda.commands.dispatching.middleware.MiddlewareRegistry;
-import com.github.kaktushose.jda.commands.reflect.ImplementationRegistry;
-import com.github.kaktushose.jda.commands.reflect.InteractionRegistry;
-import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent;
-import net.dv8tion.jda.api.events.interaction.ModalInteractionEvent;
-import net.dv8tion.jda.api.events.interaction.command.CommandAutoCompleteInteractionEvent;
-import net.dv8tion.jda.api.events.interaction.command.GenericCommandInteractionEvent;
-import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
-import net.dv8tion.jda.api.events.interaction.component.GenericComponentInteractionCreateEvent;
-import net.dv8tion.jda.api.hooks.ListenerAdapter;
-import org.jetbrains.annotations.NotNull;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Optional;
-
-/**
- * Registry for {@link GenericDispatcher Dispatchers}. Delegates incoming {@link Context} to the respective
- * {@link GenericDispatcher}.
- *
- * @since 4.0.0
- */
-public class DispatcherSupervisor extends ListenerAdapter {
-
-    private static final Logger log = LoggerFactory.getLogger(DispatcherSupervisor.class);
-    private final Map<Class<? extends GenericInteractionCreateEvent>, GenericDispatcher> dispatchers;
-    private final InteractionRegistry interactionRegistry;
-    private final ImplementationRegistry implementationRegistry;
-
-    /**
-     * Constructs a new DispatcherSupervisor.
-     */
-    public DispatcherSupervisor(MiddlewareRegistry middlewareRegistry, ImplementationRegistry implementationRegistry, InteractionRegistry interactionRegistry, TypeAdapterRegistry adapterRegistry, RuntimeSupervisor runtimeSupervisor) {
-        dispatchers = new HashMap<>();
-        register(GenericCommandInteractionEvent.class, new CommandDispatcher(middlewareRegistry, implementationRegistry, interactionRegistry, adapterRegistry, runtimeSupervisor));
-        register(CommandAutoCompleteInteractionEvent.class, new AutoCompleteDispatcher(middlewareRegistry, implementationRegistry, interactionRegistry, adapterRegistry, runtimeSupervisor));
-        register(GenericComponentInteractionCreateEvent.class, new ComponentDispatcher(middlewareRegistry, implementationRegistry, interactionRegistry, adapterRegistry, runtimeSupervisor));
-        register(ModalInteractionEvent.class, new ModalDispatcher(middlewareRegistry, implementationRegistry, interactionRegistry, adapterRegistry, runtimeSupervisor));
-        this.interactionRegistry = interactionRegistry;
-        this.implementationRegistry = implementationRegistry;
-    }
-
-    /**
-     * Registers a new {@link GenericDispatcher}.
-     *
-     * @param event      a subtype of {@link GenericInteractionCreateEvent}
-     * @param dispatcher the {@link GenericDispatcher} implementation for the event
-     */
-    public void register(@NotNull Class<? extends GenericInteractionCreateEvent> event, @NotNull GenericDispatcher dispatcher) {
-        dispatchers.put(event, dispatcher);
-        log.debug("Registered dispatcher {} for event {}", dispatcher.getClass().getName(), event.getSimpleName());
-    }
-
-    /**
-     * Unregisters a {@link GenericDispatcher}
-     *
-     * @param event the {@link GenericInteractionCreateEvent} to unregister any {@link GenericDispatcher} for
-     */
-    public void unregister(@NotNull Class<? extends GenericInteractionCreateEvent> event) {
-        dispatchers.remove(event);
-        log.debug("Unregistered dispatcher binding for event {}", event.getSimpleName());
-    }
-
-    @Override
-    public void onGenericInteractionCreate(@NotNull GenericInteractionCreateEvent event) {
-        Class<?> clazz = event.getClass();
-        Optional<Class<? extends GenericInteractionCreateEvent>> key = dispatchers.keySet().stream()
-                .filter(it -> it.isAssignableFrom(clazz))
-                .findFirst();
-        if (key.isEmpty()) {
-            log.debug("No dispatcher found for {}", clazz.getSimpleName());
-            return;
-        }
-
-        Context context = SlashCommandInteractionEvent.class.isAssignableFrom(clazz)
-                ? new SlashCommandContext((SlashCommandInteractionEvent) event, interactionRegistry, implementationRegistry)
-                : new Context(event, interactionRegistry, implementationRegistry);
-
-        GenericDispatcher dispatcher = dispatchers.get(key.get());
-        log.debug("Calling {}", dispatcher.getClass().getName());
-        try {
-            dispatcher.onEvent(context);
-        } catch (Exception e) {
-            //TODO send this as a reply
-            log.error("Command execution failed!", e);
-        }
-    }
-}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/ExpirationStrategy.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/ExpirationStrategy.java
new file mode 100644
index 000000000..78ffd3951
--- /dev/null
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/ExpirationStrategy.java
@@ -0,0 +1,29 @@
+package com.github.kaktushose.jda.commands.dispatching;
+
+import com.github.kaktushose.jda.commands.dispatching.events.Event;
+
+/// Classes implementing [ExpirationStrategy] define a strategy when a [`Runtime`]({@docRoot}/index.html#runtime-concept-heading) should be closed.
+///
+/// There are two strategies available:
+/// - [Inactivity]: closes a [`Runtime`]({@docRoot}/index.html#runtime-concept-heading) after the passed amount of time
+/// - [Explicit]: **Only** closes a runtime when [Event#closeRuntime()] is called.
+///
+/// @implNote The [Inactivity] strategy will check all active [`Runtimes`]({@docRoot}/index.html#runtime-concept-heading) at every incoming jda event. If a
+/// [`Runtime`]({@docRoot}/index.html#runtime-concept-heading) didn't handle any events in the last *x* minutes, it will be closed.
+/// @since 4.0.0
+public sealed interface ExpirationStrategy {
+
+    /// Default [ExpirationStrategy] of [Inactivity], that closes [`Runtimes`]({@docRoot}/index.html#runtime-concept-heading) after *15* minutes of inactivity.
+    ExpirationStrategy AFTER_15_MINUTES = new ExpirationStrategy.Inactivity(15);
+
+    /// Default [ExpirationStrategy] of [Explicit].
+    ExpirationStrategy EXPLICIT = new ExpirationStrategy.Explicit();
+
+    /// [ExpirationStrategy] that closes a [`Runtime`]({@docRoot}/index.html#runtime-concept-heading) after the passed amount of time.
+    ///
+    /// @param afterMinutes the amount of time after a [`Runtime`]({@docRoot}/index.html#runtime-concept-heading) should be closed, in minutes.
+    record Inactivity(long afterMinutes) implements ExpirationStrategy {}
+
+    /// [ExpirationStrategy] that closes a [`Runtime`]({@docRoot}/index.html#runtime-concept-heading) **only** when [Event#closeRuntime()] has been called.
+    record Explicit() implements ExpirationStrategy {}
+}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/RuntimeSupervisor.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/RuntimeSupervisor.java
deleted file mode 100644
index 1de864ce0..000000000
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/RuntimeSupervisor.java
+++ /dev/null
@@ -1,254 +0,0 @@
-package com.github.kaktushose.jda.commands.dispatching;
-
-import com.github.kaktushose.jda.commands.annotations.interactions.Interaction;
-import com.github.kaktushose.jda.commands.annotations.interactions.StaticInstance;
-import com.github.kaktushose.jda.commands.dependency.DependencyInjector;
-import com.github.kaktushose.jda.commands.reflect.interactions.AutoCompleteDefinition;
-import com.github.kaktushose.jda.commands.reflect.interactions.GenericInteractionDefinition;
-import com.github.kaktushose.jda.commands.reflect.interactions.components.GenericComponentDefinition;
-import net.dv8tion.jda.api.events.interaction.ModalInteractionEvent;
-import net.dv8tion.jda.api.events.interaction.command.GenericCommandInteractionEvent;
-import net.dv8tion.jda.api.events.interaction.component.GenericComponentInteractionCreateEvent;
-import net.dv8tion.jda.api.utils.messages.MessageCreateData;
-import org.jetbrains.annotations.Nullable;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Optional;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ScheduledThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
-
-import static com.github.kaktushose.jda.commands.reflect.interactions.CustomId.CUSTOM_ID_REGEX;
-
-/**
- * Supervisor that creates and stores {@link InteractionRuntime InteractionRuntimes}. This supervisor will create a
- * new {@link InteractionRuntime} for every command execution with a TTL of 15 minutes.
- *
- * @since 4.0.0
- */
-public class RuntimeSupervisor {
-
-    private final Map<String, InteractionRuntime> runtimes;
-    private final ScheduledExecutorService executor;
-    private final DependencyInjector injector;
-
-    /**
-     * Constructs a new RuntimeSupervisor.
-     */
-    public RuntimeSupervisor(DependencyInjector injector) {
-        this.injector = injector;
-        runtimes = new HashMap<>();
-        executor = new ScheduledThreadPoolExecutor(4);
-    }
-
-    /**
-     * Creates a new {@link InteractionRuntime}, which will expire after 15 minutes. If the interaction class is instead
-     * marked with {@link StaticInstance} will instead return the static instance.
-     *
-     * @param event       the {@link GenericCommandInteractionEvent} to create the {@link InteractionRuntime} for
-     * @param interaction the {@link GenericInteractionDefinition} to create the {@link InteractionRuntime} from
-     * @return a new {@link InteractionRuntime} with a TTL of 15 minutes
-     * @throws InvocationTargetException if the underlying constructor throws an exception
-     * @throws InstantiationException    if the class that declares the underlying constructor represents an abstract class
-     * @throws IllegalAccessException    if this Constructor object is enforcing Java language access control and
-     *                                   the underlying constructor is inaccessible
-     */
-    public InteractionRuntime newRuntime(GenericCommandInteractionEvent event, GenericInteractionDefinition interaction)
-            throws InvocationTargetException, InstantiationException, IllegalAccessException {
-
-        Class<?> interactionClass = interaction.getMethod().getDeclaringClass();
-        if (interactionClass.isAnnotationPresent(StaticInstance.class)) {
-            String runtimeId = String.format("s%s", interactionClass.getName().hashCode());
-            if (runtimes.containsKey(runtimeId)) {
-                return runtimes.get(runtimeId);
-            }
-
-            Object instance = interaction.newInstance();
-            injector.inject(instance);
-
-            InteractionRuntime runtime = new InteractionRuntime(runtimeId, instance);
-            runtimes.put(runtimeId, runtime);
-            return runtime;
-        }
-
-        Object instance = interaction.newInstance();
-        injector.inject(instance);
-
-        String id = event.getId();
-        InteractionRuntime runtime = new InteractionRuntime(id, instance);
-
-        runtimes.put(id, runtime);
-        executor.schedule(() -> runtimes.remove(id), 15, TimeUnit.MINUTES);
-
-        return runtime;
-    }
-
-    /**
-     * Gets the static runtime for the given {@link AutoCompleteDefinition}. If no instance exists yet, creates, stores and then
-     * returns the instance.
-     *
-     * @param autoComplete the {@link GenericInteractionDefinition} to create or get an instance from
-     * @return an instance of the provided {@link GenericInteractionDefinition}
-     * @throws InvocationTargetException if the underlying constructor throws an exception
-     * @throws InstantiationException    if the class that declares the underlying constructor represents an abstract class
-     * @throws IllegalAccessException    if this Constructor object is enforcing Java language access control and
-     *                                   the underlying constructor is inaccessible
-     */
-    public InteractionRuntime newRuntime(AutoCompleteDefinition autoComplete)
-            throws InvocationTargetException, InstantiationException, IllegalAccessException {
-        String runtimeId = String.format("s%s", autoComplete.getMethod().getDeclaringClass().getName().hashCode());
-        if (runtimes.containsKey(runtimeId)) {
-            return runtimes.get(runtimeId);
-        }
-
-        Object instance = autoComplete.newInstance();
-        injector.inject(instance);
-
-        InteractionRuntime runtime = new InteractionRuntime(runtimeId, instance);
-        runtimes.put(runtimeId, runtime);
-        return runtime;
-    }
-
-    /**
-     * Creates a new runtime for the given {@link GenericComponentDefinition}. This runtime will always be static.
-     *
-     * @param componentDefinition the {@link GenericComponentDefinition} to create the runtime for
-     */
-    public InteractionRuntime newRuntime(GenericComponentDefinition componentDefinition) {
-        Class<?> interactionClass = componentDefinition.getMethod().getDeclaringClass();
-        String runtimeId = String.format("s%s", interactionClass.getName().hashCode());
-        if (runtimes.containsKey(runtimeId)) {
-            return runtimes.get(runtimeId);
-        }
-
-        Object instance;
-        try {
-            instance = componentDefinition.newInstance();
-        } catch (InvocationTargetException | InstantiationException | IllegalAccessException e) {
-            throw new RuntimeException(e);
-        }
-
-        injector.inject(instance);
-
-        InteractionRuntime runtime = new InteractionRuntime(runtimeId, instance);
-        runtimes.put(runtimeId, runtime);
-
-        return runtime;
-    }
-
-    /**
-     * Gets an {@link Optional} holding the {@link InteractionRuntime}. Returns an empty {@link Optional} if no
-     * {@link InteractionRuntime} has been created yet by calling
-     * {@link #newRuntime(GenericCommandInteractionEvent, GenericInteractionDefinition)}, if the underlying component wasn't
-     * created by jda-commands or if the {@link InteractionRuntime} expired.
-     *
-     * @param event the {@link GenericComponentInteractionCreateEvent} to get the {@link InteractionRuntime} for
-     * @return an {@link Optional} holding the {@link InteractionRuntime}
-     */
-    public Optional<InteractionRuntime> getRuntime(GenericComponentInteractionCreateEvent event) {
-        return getRuntime(event.getComponentId());
-    }
-
-    /**
-     * Gets an {@link Optional} holding the {@link InteractionRuntime}. Returns an empty {@link Optional} if no
-     * {@link InteractionRuntime} has been created yet by calling
-     * {@link #newRuntime(GenericCommandInteractionEvent, GenericInteractionDefinition)}, if the underlying component wasn't
-     * created by jda-commands or if the {@link InteractionRuntime} expired.
-     *
-     * @param event the {@link ModalInteractionEvent} to get the {@link InteractionRuntime} for
-     * @return an {@link Optional} holding the {@link InteractionRuntime}
-     */
-    public Optional<InteractionRuntime> getRuntime(ModalInteractionEvent event) {
-        return getRuntime(event.getModalId());
-    }
-
-    private Optional<InteractionRuntime> getRuntime(String interactionId) {
-        if (!interactionId.matches(CUSTOM_ID_REGEX)) {
-            return Optional.empty();
-        }
-        String runtimeId = interactionId.split("\\.")[2];
-        return Optional.ofNullable(runtimes.get(runtimeId));
-    }
-
-    /**
-     * A runtime used for executing interactions. This class holds the instance of the class annotated with
-     * {@link Interaction Interaction} where commands, buttonContainers, etc. live in. This runtime can only be used once per
-     * command execution.
-     *
-     * @since 4.0.0
-     */
-    public static class InteractionRuntime {
-        private final String runtimeId;
-        private final Object instance;
-        private MessageCreateData messageCreateData;
-        private KeyValueStore keyValueStore;
-
-        /**
-         * Constructs a new InteractionRuntime.
-         *
-         * @param runtimeId the id of this instance, i.e. the snowflake id of the event creating this runtime
-         * @param instance  the instance of the {@link Interaction Interaction} class
-         */
-        public InteractionRuntime(String runtimeId, Object instance) {
-            this.runtimeId = runtimeId;
-            this.instance = instance;
-            keyValueStore = new KeyValueStore();
-        }
-
-        /**
-         * Gets the instance id.
-         *
-         * @return the instance id
-         */
-        public String getRuntimeId() {
-            return runtimeId;
-        }
-
-        /**
-         * Gets the instance.
-         *
-         * @return the instance
-         */
-        public Object getInstance() {
-            return instance;
-        }
-
-        /**
-         * Gets the latest message that was sent with this runtime.
-         *
-         * @return an {@link Optional} holding a {@link MessageCreateData} describing the latest message
-         */
-        public Optional<MessageCreateData> getLatestReply() {
-            return Optional.ofNullable(messageCreateData);
-        }
-
-        /**
-         * Sets the latest message sent with this runtime.
-         *
-         * @param messageCreateData a {@link MessageCreateData} describing the latest message
-         */
-        public void setLatestReply(@Nullable MessageCreateData messageCreateData) {
-            this.messageCreateData = messageCreateData;
-        }
-
-        /**
-         * Gets the {@link KeyValueStore} that is bound to this runtime.
-         *
-         * @return the {@link KeyValueStore} bound to this runtime
-         */
-        public KeyValueStore getKeyValueStore() {
-            return keyValueStore;
-        }
-
-        /**
-         * Sets the {@link KeyValueStore} that is bound to this runtime.
-         *
-         * @param keyValueStore the {@link KeyValueStore} bound to this runtime
-         */
-        public void setKeyValueStore(KeyValueStore keyValueStore) {
-            this.keyValueStore = keyValueStore;
-        }
-    }
-}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/TypeAdapter.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/TypeAdapter.java
index bb6ece764..d164331fa 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/TypeAdapter.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/TypeAdapter.java
@@ -1,6 +1,6 @@
 package com.github.kaktushose.jda.commands.dispatching.adapter;
 
-import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
+import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Optional;
@@ -10,19 +10,19 @@
  * Generic top level interface for type adapting.
  *
  * @param <T> the type the adapter parses
- * @see com.github.kaktushose.jda.commands.annotations.Implementation
+ * @see com.github.kaktushose.jda.commands.annotations.Implementation Implementation
  * @since 2.0.0
  */
 @FunctionalInterface
-public interface TypeAdapter<T> extends BiFunction<String, Context, Optional<T>> {
+public interface TypeAdapter<T> extends BiFunction<String, GenericInteractionCreateEvent, Optional<T>> {
 
     /**
      * Attempts to parse a String to the given type.
      *
-     * @param raw     the String to parse
-     * @param context the {@link Context}
+     * @param raw   the String to parse
+     * @param event the {@link GenericInteractionCreateEvent}
      * @return the parsed type or an empty Optional if the parsing fails
      */
-    Optional<T> apply(@NotNull String raw, @NotNull Context context);
+    @NotNull Optional<T> apply(@NotNull String raw, @NotNull GenericInteractionCreateEvent event);
 
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/TypeAdapterRegistry.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/TypeAdapterRegistry.java
index 78c7b0c29..0289c12f6 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/TypeAdapterRegistry.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/TypeAdapterRegistry.java
@@ -1,10 +1,6 @@
 package com.github.kaktushose.jda.commands.dispatching.adapter;
 
 import com.github.kaktushose.jda.commands.dispatching.adapter.impl.*;
-import com.github.kaktushose.jda.commands.dispatching.interactions.commands.SlashCommandContext;
-import com.github.kaktushose.jda.commands.embeds.ErrorMessageFactory;
-import com.github.kaktushose.jda.commands.reflect.ParameterDefinition;
-import com.github.kaktushose.jda.commands.reflect.interactions.commands.SlashCommandDefinition;
 import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.Role;
 import net.dv8tion.jda.api.entities.User;
@@ -17,7 +13,9 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.*;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
 
 /**
  * Central registry for all type adapters.
@@ -27,19 +25,17 @@
  */
 public class TypeAdapterRegistry {
 
+    public static final Map<Class<?>, Object> DEFAULT_MAPPINGS = Map.of(
+            byte.class, ((byte) 0),
+            short.class, ((short) 0),
+            int.class, 0,
+            long.class, 0L,
+            double.class, 0.0d,
+            float.class, 0.0f,
+            boolean.class, false,
+            char.class, '\u0000'
+    );
     private static final Logger log = LoggerFactory.getLogger(TypeAdapterRegistry.class);
-    private static final Map<Class<?>, Object> DEFAULT_MAPPINGS = new HashMap<>() {
-        {
-            put(byte.class, (byte) 0);
-            put(short.class, (short) 0);
-            put(int.class, 0);
-            put(long.class, 0L);
-            put(double.class, 0.0d);
-            put(float.class, 0.0f);
-            put(boolean.class, false);
-            put(char.class, '\u0000');
-        }
-    };
     private final Map<Class<?>, TypeAdapter<?>> parameterAdapters;
 
     /**
@@ -50,7 +46,7 @@ public class TypeAdapterRegistry {
      *     <li>String Array</li>
      *     <li>{@link Member}</li>
      *     <li>{@link User}</li>
-     *     <li>{@link TextChannel}</li>
+     *     <li>{@link net.dv8tion.jda.api.entities.channel.middleman.MessageChannel MessageChannel} and subtypes</li>
      *     <li>{@link Role}</li>
      * </ul>
      */
@@ -66,8 +62,8 @@ public TypeAdapterRegistry() {
         register(Double.class, new DoubleAdapter());
         register(Character.class, new CharacterAdapter());
         register(Boolean.class, new BooleanAdapter());
-        register(String.class, (TypeAdapter<String>) (raw, guild) -> Optional.of(raw));
-        register(String[].class, (TypeAdapter<String>) (raw, guild) -> Optional.of(raw));
+        register(String.class, (TypeAdapter<String>) (raw, _) -> Optional.of(raw));
+        register(String[].class, (TypeAdapter<String>) (raw, _) -> Optional.of(raw));
 
         // jda specific
         register(Member.class, new MemberAdapter());
@@ -124,69 +120,5 @@ public Optional<TypeAdapter<?>> get(@Nullable Class<?> type) {
         return Optional.ofNullable(parameterAdapters.get(type));
     }
 
-    /**
-     * Takes a {@link SlashCommandContext} and attempts to type adapt the command input to the type specified by the
-     * {@link SlashCommandDefinition}. Cancels the {@link SlashCommandContext} if the type adapting fails.
-     *
-     * @param context the {@link SlashCommandContext} to type adapt
-     */
-    public void adapt(@NotNull SlashCommandContext context) {
-        SlashCommandDefinition command = Objects.requireNonNull(context.getCommand());
-        List<Object> arguments = new ArrayList<>();
-        String[] input = context.getInput();
-        ErrorMessageFactory messageFactory = context.getImplementationRegistry().getErrorMessageFactory();
-
-        log.debug("Type adapting arguments...");
-        for (int i = 0; i < command.getActualParameters().size(); i++) {
-            ParameterDefinition parameter = command.getActualParameters().get(i);
-
-            // if parameter is array don't parse
-            if (String[].class.isAssignableFrom(parameter.type())) {
-                log.debug("First parameter is String array. Not adapting arguments");
-                arguments.add(input);
-                break;
-            }
-
-            String raw;
-            // current parameter index == total amount of input, check if it's optional else cancel context
-            if (i >= input.length) {
-                if (!parameter.isOptional()) {
-                    IllegalStateException exception = new IllegalStateException(
-                            "Command input doesn't match parameter length! Please report this error the the devs of jda-commands."
-                    );
-                    context.setCancelled(messageFactory.getCommandExecutionFailedMessage(context, exception));
-                    throw exception;
-                }
 
-                // if the default value is an empty String (thus not present) add a null value to the argument list
-                // else try to type adapt the default value
-                if (parameter.defaultValue() == null) {
-                    arguments.add(DEFAULT_MAPPINGS.getOrDefault(parameter.type(), null));
-                    continue;
-                } else {
-                    raw = parameter.defaultValue();
-                }
-            } else {
-                raw = input[i];
-            }
-
-            log.debug("Trying to adapt input \"{}\" to type {}", raw, parameter.type().getName());
-
-            Optional<TypeAdapter<?>> adapter = get(parameter.type());
-            if (adapter.isEmpty()) {
-                throw new IllegalArgumentException("No type adapter found!");
-            }
-
-            Optional<?> parsed = adapter.get().apply(raw, context);
-            if (parsed.isEmpty()) {
-                log.debug("Type adapting failed!");
-                context.setCancelled(messageFactory.getTypeAdaptingFailedMessage(context));
-                break;
-            }
-
-            arguments.add(parsed.get());
-            log.debug("Added \"{}\" to the argument list", parsed.get());
-        }
-        context.setArguments(arguments);
-    }
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/AudioChannelAdapter.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/AudioChannelAdapter.java
index 761277506..828c83134 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/AudioChannelAdapter.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/AudioChannelAdapter.java
@@ -1,10 +1,10 @@
 package com.github.kaktushose.jda.commands.dispatching.adapter.impl;
 
-import com.github.kaktushose.jda.commands.Helpers;
+import com.github.kaktushose.jda.commands.internal.Helpers;
 import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapter;
-import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
 import net.dv8tion.jda.api.entities.channel.Channel;
 import net.dv8tion.jda.api.entities.channel.middleman.AudioChannel;
+import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Optional;
@@ -19,18 +19,19 @@ public class AudioChannelAdapter implements TypeAdapter<AudioChannel> {
     /**
      * Attempts to parse a String to a {@link AudioChannel}. Accepts both the channel id and name.
      *
-     * @param raw     the String to parse
-     * @param context the {@link Context}
+     * @param raw   the String to parse
+     * @param event the {@link GenericInteractionCreateEvent}
      * @return the parsed {@link AudioChannel} or an empty Optional if the parsing fails
      */
+    @NotNull
     @Override
-    public Optional<AudioChannel> apply(@NotNull String raw, @NotNull Context context) {
-        Channel channel = context.getEvent().getChannel();
+    public Optional<AudioChannel> apply(@NotNull String raw, @NotNull GenericInteractionCreateEvent event) {
+        Channel channel = event.getChannel();
         if (channel == null) {
             return Optional.empty();
         }
 
-        return Helpers.resolveGuildChannel(context, raw)
+        return Helpers.resolveGuildChannel(raw, event)
                 .filter(it -> it.getType().isAudio())
                 .map(AudioChannel.class::cast);
     }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/BooleanAdapter.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/BooleanAdapter.java
index f34be3cd1..ceed0a002 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/BooleanAdapter.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/BooleanAdapter.java
@@ -1,7 +1,7 @@
 package com.github.kaktushose.jda.commands.dispatching.adapter.impl;
 
 import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapter;
-import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
+import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Optional;
@@ -17,12 +17,13 @@ public class BooleanAdapter implements TypeAdapter<Boolean> {
      * Attempts to parse a String to a Boolean. Accepts both String literals and {@code 0} or {@code 1}.
      * Parsing is <em>case-insensitive</em>.
      *
-     * @param raw     the String to parse
-     * @param context the {@link Context}
+     * @param raw   the String to parse
+     * @param event the {@link GenericInteractionCreateEvent}
      * @return the parsed boolean or an empty Optional if the parsing fails
      */
+    @NotNull
     @Override
-    public Optional<Boolean> apply(@NotNull String raw, @NotNull Context context) {
+    public Optional<Boolean> apply(@NotNull String raw, @NotNull GenericInteractionCreateEvent event) {
         if ("true".equalsIgnoreCase(raw) || "1".equals(raw)) {
             return Optional.of(true);
         }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/ByteAdapter.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/ByteAdapter.java
index 6cff244ad..761e0cb25 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/ByteAdapter.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/ByteAdapter.java
@@ -1,7 +1,7 @@
 package com.github.kaktushose.jda.commands.dispatching.adapter.impl;
 
 import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapter;
-import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
+import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Optional;
@@ -16,12 +16,13 @@ public class ByteAdapter implements TypeAdapter<Byte> {
     /**
      * Attempts to parse a String to a Byte.
      *
-     * @param raw     the String to parse
-     * @param context the {@link Context}
+     * @param raw   the String to parse
+     * @param event the {@link GenericInteractionCreateEvent}
      * @return the parsed Byte or an empty Optional if the parsing fails
      */
+    @NotNull
     @Override
-    public Optional<Byte> apply(@NotNull String raw, @NotNull Context context) {
+    public Optional<Byte> apply(@NotNull String raw, @NotNull GenericInteractionCreateEvent event) {
         try {
             return Optional.of(Byte.valueOf(raw));
         } catch (NumberFormatException ignored) {
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/CharacterAdapter.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/CharacterAdapter.java
index 295379dd6..a58a30923 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/CharacterAdapter.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/CharacterAdapter.java
@@ -1,7 +1,7 @@
 package com.github.kaktushose.jda.commands.dispatching.adapter.impl;
 
 import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapter;
-import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
+import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Optional;
@@ -16,12 +16,13 @@ public class CharacterAdapter implements TypeAdapter<Character> {
     /**
      * Casts a String to a Char if and only if {@code raw.length == 1}. Else, returns an empty Optional.
      *
-     * @param raw     the String to parse
-     * @param context the {@link Context}
+     * @param raw   the String to parse
+     * @param event the {@link GenericInteractionCreateEvent}
      * @return the parsed Char or an empty Optional if the parsing fails
      */
+    @NotNull
     @Override
-    public Optional<Character> apply(@NotNull String raw, @NotNull Context context) {
+    public Optional<Character> apply(@NotNull String raw, @NotNull GenericInteractionCreateEvent event) {
         if (raw.length() == 1) {
             return Optional.of(raw.charAt(0));
         }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/DoubleAdapter.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/DoubleAdapter.java
index 891ba7202..93da24305 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/DoubleAdapter.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/DoubleAdapter.java
@@ -1,7 +1,7 @@
 package com.github.kaktushose.jda.commands.dispatching.adapter.impl;
 
 import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapter;
-import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
+import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Optional;
@@ -16,12 +16,13 @@ public class DoubleAdapter implements TypeAdapter<Double> {
     /**
      * Attempts to parse a String to a Double.
      *
-     * @param raw     the String to parse
-     * @param context the {@link Context}
+     * @param raw   the String to parse
+     * @param event the {@link GenericInteractionCreateEvent}
      * @return the parsed Double or an empty Optional if the parsing fails
      */
+    @NotNull
     @Override
-    public Optional<Double> apply(@NotNull String raw, @NotNull Context context) {
+    public Optional<Double> apply(@NotNull String raw, @NotNull GenericInteractionCreateEvent event) {
         try {
             return Optional.of(Double.valueOf(raw));
         } catch (NumberFormatException ignored) {
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/FloatAdapter.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/FloatAdapter.java
index 5fd3b5c2e..cdf56c273 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/FloatAdapter.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/FloatAdapter.java
@@ -1,7 +1,7 @@
 package com.github.kaktushose.jda.commands.dispatching.adapter.impl;
 
 import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapter;
-import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
+import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Optional;
@@ -16,12 +16,13 @@ public class FloatAdapter implements TypeAdapter<Float> {
     /**
      * Attempts to parse a String to a Float.
      *
-     * @param raw     the String to parse
-     * @param context the {@link Context}
+     * @param raw   the String to parse
+     * @param event the {@link GenericInteractionCreateEvent}
      * @return the parsed Float or an empty Optional if the parsing fails
      */
+    @NotNull
     @Override
-    public Optional<Float> apply(@NotNull String raw, @NotNull Context context) {
+    public Optional<Float> apply(@NotNull String raw, @NotNull GenericInteractionCreateEvent event) {
         try {
             return Optional.of(Float.valueOf(raw));
         } catch (NumberFormatException ignored) {
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/GuildChannelAdapter.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/GuildChannelAdapter.java
index aaa78ed8f..3fa37a155 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/GuildChannelAdapter.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/GuildChannelAdapter.java
@@ -1,10 +1,10 @@
 package com.github.kaktushose.jda.commands.dispatching.adapter.impl;
 
-import com.github.kaktushose.jda.commands.Helpers;
+import com.github.kaktushose.jda.commands.internal.Helpers;
 import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapter;
-import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
 import net.dv8tion.jda.api.entities.channel.Channel;
 import net.dv8tion.jda.api.entities.channel.middleman.GuildChannel;
+import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Optional;
@@ -19,17 +19,18 @@ public class GuildChannelAdapter implements TypeAdapter<GuildChannel> {
     /**
      * Attempts to parse a String to a {@link GuildChannel}. Accepts both the channel id and name.
      *
-     * @param raw     the String to parse
-     * @param context the {@link Context}
+     * @param raw   the String to parse
+     * @param event the {@link GenericInteractionCreateEvent}
      * @return the parsed {@link GuildChannel} or an empty Optional if the parsing fails
      */
+    @NotNull
     @Override
-    public Optional<GuildChannel> apply(@NotNull String raw, @NotNull Context context) {
-        Channel channel = context.getEvent().getChannel();
+    public Optional<GuildChannel> apply(@NotNull String raw, @NotNull GenericInteractionCreateEvent event) {
+        Channel channel = event.getChannel();
         if (channel == null) {
             return Optional.empty();
         }
 
-        return Helpers.resolveGuildChannel(context, raw);
+        return Helpers.resolveGuildChannel(raw, event);
     }
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/GuildMessageChannelAdapter.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/GuildMessageChannelAdapter.java
index 917285bdd..93607c0a9 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/GuildMessageChannelAdapter.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/GuildMessageChannelAdapter.java
@@ -1,10 +1,10 @@
 package com.github.kaktushose.jda.commands.dispatching.adapter.impl;
 
-import com.github.kaktushose.jda.commands.Helpers;
+import com.github.kaktushose.jda.commands.internal.Helpers;
 import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapter;
-import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
 import net.dv8tion.jda.api.entities.channel.Channel;
 import net.dv8tion.jda.api.entities.channel.middleman.GuildMessageChannel;
+import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Optional;
@@ -19,18 +19,19 @@ public class GuildMessageChannelAdapter implements TypeAdapter<GuildMessageChann
     /**
      * Attempts to parse a String to a {@link GuildMessageChannel}. Accepts both the channel id and name.
      *
-     * @param raw     the String to parse
-     * @param context the {@link Context}
+     * @param raw   the String to parse
+     * @param event the {@link GenericInteractionCreateEvent}
      * @return the parsed {@link GuildMessageChannel} or an empty Optional if the parsing fails
      */
+    @NotNull
     @Override
-    public Optional<GuildMessageChannel> apply(@NotNull String raw, @NotNull Context context) {
-        Channel channel = context.getEvent().getChannel();
+    public Optional<GuildMessageChannel> apply(@NotNull String raw, @NotNull GenericInteractionCreateEvent event) {
+        Channel channel = event.getChannel();
         if (channel == null) {
             return Optional.empty();
         }
 
-        return Helpers.resolveGuildChannel(context, raw)
+        return Helpers.resolveGuildChannel(raw, event)
                 .filter(it -> it.getType().isMessage())
                 .map(GuildMessageChannel.class::cast);
     }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/IntegerAdapter.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/IntegerAdapter.java
index af18275a0..8ad95d21c 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/IntegerAdapter.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/IntegerAdapter.java
@@ -1,7 +1,7 @@
 package com.github.kaktushose.jda.commands.dispatching.adapter.impl;
 
 import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapter;
-import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
+import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Optional;
@@ -16,12 +16,13 @@ public class IntegerAdapter implements TypeAdapter<Integer> {
     /**
      * Attempts to parse a String to an Integer.
      *
-     * @param raw     the String to parse
-     * @param context the {@link Context}
+     * @param raw   the String to parse
+     * @param event the {@link GenericInteractionCreateEvent}
      * @return the parsed Integer or an empty Optional if the parsing fails
      */
+    @NotNull
     @Override
-    public Optional<Integer> apply(@NotNull String raw, @NotNull Context context) {
+    public Optional<Integer> apply(@NotNull String raw, @NotNull GenericInteractionCreateEvent event) {
         try {
             return Optional.of((int) Double.parseDouble(raw));
         } catch (NumberFormatException ignored) {
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/LongAdapter.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/LongAdapter.java
index 7b753cf47..53151a042 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/LongAdapter.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/LongAdapter.java
@@ -1,7 +1,7 @@
 package com.github.kaktushose.jda.commands.dispatching.adapter.impl;
 
 import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapter;
-import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
+import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Optional;
@@ -16,12 +16,13 @@ public class LongAdapter implements TypeAdapter<Long> {
     /**
      * Attempts to parse a String to a Long.
      *
-     * @param raw     the String to parse
-     * @param context the {@link Context}
+     * @param raw   the String to parse
+     * @param event the {@link GenericInteractionCreateEvent}
      * @return the parsed Long or an empty Optional if the parsing fails
      */
+    @NotNull
     @Override
-    public Optional<Long> apply(@NotNull String raw, @NotNull Context context) {
+    public Optional<Long> apply(@NotNull String raw, @NotNull GenericInteractionCreateEvent event) {
         try {
             return Optional.of((long) Double.parseDouble(raw));
         } catch (NumberFormatException ignored) {
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/MemberAdapter.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/MemberAdapter.java
index e7faf5e64..cde583edf 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/MemberAdapter.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/MemberAdapter.java
@@ -1,10 +1,10 @@
 package com.github.kaktushose.jda.commands.dispatching.adapter.impl;
 
-import com.github.kaktushose.jda.commands.Helpers;
+import com.github.kaktushose.jda.commands.internal.Helpers;
 import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapter;
-import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
 import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.Member;
+import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent;
 import net.dv8tion.jda.api.exceptions.ErrorResponseException;
 import org.jetbrains.annotations.NotNull;
 
@@ -20,20 +20,21 @@ public class MemberAdapter implements TypeAdapter<Member> {
     /**
      * Attempts to parse a String to a {@link Member}. Accepts both the member id and name.
      *
-     * @param raw     the String to parse
-     * @param context the {@link Context}
+     * @param raw   the String to parse
+     * @param event the {@link GenericInteractionCreateEvent}
      * @return the parsed {@link Member} or an empty Optional if the parsing fails
      */
+    @NotNull
     @Override
-    public Optional<Member> apply(@NotNull String raw, @NotNull Context context) {
-        if (context.getEvent().getGuild() == null) {
+    public Optional<Member> apply(@NotNull String raw, @NotNull GenericInteractionCreateEvent event) {
+        if (event.getGuild() == null) {
             return Optional.empty();
         }
 
         Member member;
         raw = Helpers.sanitizeMention(raw);
 
-        Guild guild = context.getEvent().getGuild();
+        Guild guild = event.getGuild();
         if (raw.matches("\\d+")) {
             try {
                 member = guild.retrieveMemberById(raw).complete();
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/NewsChannelAdapter.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/NewsChannelAdapter.java
index 778e7f94a..7f5bf70d2 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/NewsChannelAdapter.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/NewsChannelAdapter.java
@@ -1,10 +1,10 @@
 package com.github.kaktushose.jda.commands.dispatching.adapter.impl;
 
-import com.github.kaktushose.jda.commands.Helpers;
+import com.github.kaktushose.jda.commands.internal.Helpers;
 import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapter;
-import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
 import net.dv8tion.jda.api.entities.channel.Channel;
 import net.dv8tion.jda.api.entities.channel.concrete.NewsChannel;
+import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Optional;
@@ -19,17 +19,18 @@ public class NewsChannelAdapter implements TypeAdapter<NewsChannel> {
     /**
      * Attempts to parse a String to a {@link NewsChannel}. Accepts both the channel id and name.
      *
-     * @param raw     the String to parse
-     * @param context the {@link Context}
+     * @param raw   the String to parse
+     * @param event the {@link GenericInteractionCreateEvent}
      * @return the parsed {@link NewsChannel} or an empty Optional if the parsing fails
      */
+    @NotNull
     @Override
-    public Optional<NewsChannel> apply(@NotNull String raw, @NotNull Context context) {
-        Channel channel = context.getEvent().getChannel();
+    public Optional<NewsChannel> apply(@NotNull String raw, @NotNull GenericInteractionCreateEvent event) {
+        Channel channel = event.getChannel();
         if (channel == null) {
             return Optional.empty();
         }
 
-        return Helpers.resolveGuildChannel(context, raw).filter(NewsChannel.class::isInstance).map(NewsChannel.class::cast);
+        return Helpers.resolveGuildChannel(raw, event).filter(NewsChannel.class::isInstance).map(NewsChannel.class::cast);
     }
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/RoleAdapter.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/RoleAdapter.java
index 7f0de03da..2c550bd4c 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/RoleAdapter.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/RoleAdapter.java
@@ -1,10 +1,10 @@
 package com.github.kaktushose.jda.commands.dispatching.adapter.impl;
 
-import com.github.kaktushose.jda.commands.Helpers;
+import com.github.kaktushose.jda.commands.internal.Helpers;
 import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapter;
-import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
 import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.Role;
+import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Optional;
@@ -19,20 +19,21 @@ public class RoleAdapter implements TypeAdapter<Role> {
     /**
      * Attempts to parse a String to a {@link Role}. Accepts both the role id and name.
      *
-     * @param raw     the String to parse
-     * @param context the {@link Context}
+     * @param raw   the String to parse
+     * @param event the {@link GenericInteractionCreateEvent}
      * @return the parsed {@link Role} or an empty Optional if the parsing fails
      */
+    @NotNull
     @Override
-    public Optional<Role> apply(@NotNull String raw, @NotNull Context context) {
-        if (context.getEvent().getGuild() == null) {
+    public Optional<Role> apply(@NotNull String raw, @NotNull GenericInteractionCreateEvent event) {
+        if (event.getGuild() == null) {
             return Optional.empty();
         }
 
         Role role;
         raw = Helpers.sanitizeMention(raw);
 
-        Guild guild = context.getEvent().getGuild();
+        Guild guild = event.getGuild();
         if (raw.matches("\\d+")) {
             role = guild.getRoleById(raw);
         } else {
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/ShortAdapter.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/ShortAdapter.java
index 8a4d4fe34..dbf9bb271 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/ShortAdapter.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/ShortAdapter.java
@@ -1,7 +1,7 @@
 package com.github.kaktushose.jda.commands.dispatching.adapter.impl;
 
 import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapter;
-import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
+import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Optional;
@@ -16,12 +16,13 @@ public class ShortAdapter implements TypeAdapter<Short> {
     /**
      * Attempts to parse a String to a Short.
      *
-     * @param raw     the String to parse
-     * @param context the {@link Context}
+     * @param raw   the String to parse
+     * @param event the {@link GenericInteractionCreateEvent}
      * @return the parsed Short or an empty Optional if the parsing fails
      */
+    @NotNull
     @Override
-    public Optional<Short> apply(@NotNull String raw, @NotNull Context context) {
+    public Optional<Short> apply(@NotNull String raw, @NotNull GenericInteractionCreateEvent event) {
         try {
             return Optional.of(Short.valueOf(raw));
         } catch (NumberFormatException ignored) {
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/StageChannelAdapter.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/StageChannelAdapter.java
index 4e57998cd..8f7dba30a 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/StageChannelAdapter.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/StageChannelAdapter.java
@@ -1,10 +1,10 @@
 package com.github.kaktushose.jda.commands.dispatching.adapter.impl;
 
-import com.github.kaktushose.jda.commands.Helpers;
+import com.github.kaktushose.jda.commands.internal.Helpers;
 import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapter;
-import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
 import net.dv8tion.jda.api.entities.channel.Channel;
 import net.dv8tion.jda.api.entities.channel.concrete.StageChannel;
+import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Optional;
@@ -19,17 +19,18 @@ public class StageChannelAdapter implements TypeAdapter<StageChannel> {
     /**
      * Attempts to parse a String to a {@link StageChannel}. Accepts both the channel id and name.
      *
-     * @param raw     the String to parse
-     * @param context the {@link Context}
+     * @param raw   the String to parse
+     * @param event the {@link GenericInteractionCreateEvent}
      * @return the parsed {@link StageChannel} or an empty Optional if the parsing fails
      */
+    @NotNull
     @Override
-    public Optional<StageChannel> apply(@NotNull String raw, @NotNull Context context) {
-        Channel channel = context.getEvent().getChannel();
+    public Optional<StageChannel> apply(@NotNull String raw, @NotNull GenericInteractionCreateEvent event) {
+        Channel channel = event.getChannel();
         if (channel == null) {
             return Optional.empty();
         }
 
-        return Helpers.resolveGuildChannel(context, raw).filter(StageChannel.class::isInstance).map(StageChannel.class::cast);
+        return Helpers.resolveGuildChannel(raw, event).filter(StageChannel.class::isInstance).map(StageChannel.class::cast);
     }
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/TextChannelAdapter.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/TextChannelAdapter.java
index 38dd0a4a0..7732b244e 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/TextChannelAdapter.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/TextChannelAdapter.java
@@ -1,9 +1,9 @@
 package com.github.kaktushose.jda.commands.dispatching.adapter.impl;
 
-import com.github.kaktushose.jda.commands.Helpers;
+import com.github.kaktushose.jda.commands.internal.Helpers;
 import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapter;
-import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
 import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
+import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Optional;
@@ -18,16 +18,17 @@ public class TextChannelAdapter implements TypeAdapter<TextChannel> {
     /**
      * Attempts to parse a String to a {@link TextChannel}. Accepts both the channel id and name.
      *
-     * @param raw     the String to parse
-     * @param context the {@link Context}
+     * @param raw   the String to parse
+     * @param event the {@link GenericInteractionCreateEvent}
      * @return the parsed {@link TextChannel} or an empty Optional if the parsing fails
      */
+    @NotNull
     @Override
-    public Optional<TextChannel> apply(@NotNull String raw, @NotNull Context context) {
-        if (context.getEvent().getGuild() == null) {
+    public Optional<TextChannel> apply(@NotNull String raw, @NotNull GenericInteractionCreateEvent event) {
+        if (event.getGuild() == null) {
             return Optional.empty();
         }
 
-        return Helpers.resolveGuildChannel(context, raw).filter(TextChannel.class::isInstance).map(TextChannel.class::cast);
+        return Helpers.resolveGuildChannel(raw, event).filter(TextChannel.class::isInstance).map(TextChannel.class::cast);
     }
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/ThreadChannelAdapter.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/ThreadChannelAdapter.java
index 7a797d9c1..d0c3fd180 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/ThreadChannelAdapter.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/ThreadChannelAdapter.java
@@ -1,10 +1,10 @@
 package com.github.kaktushose.jda.commands.dispatching.adapter.impl;
 
-import com.github.kaktushose.jda.commands.Helpers;
+import com.github.kaktushose.jda.commands.internal.Helpers;
 import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapter;
-import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
 import net.dv8tion.jda.api.entities.channel.Channel;
 import net.dv8tion.jda.api.entities.channel.concrete.ThreadChannel;
+import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Optional;
@@ -19,17 +19,18 @@ public class ThreadChannelAdapter implements TypeAdapter<ThreadChannel> {
     /**
      * Attempts to parse a String to a {@link ThreadChannel}. Accepts both the channel id and name.
      *
-     * @param raw     the String to parse
-     * @param context the {@link Context}
+     * @param raw   the String to parse
+     * @param event the {@link GenericInteractionCreateEvent}
      * @return the parsed {@link ThreadChannel} or an empty Optional if the parsing fails
      */
+    @NotNull
     @Override
-    public Optional<ThreadChannel> apply(@NotNull String raw, @NotNull Context context) {
-        Channel channel = context.getEvent().getChannel();
+    public Optional<ThreadChannel> apply(@NotNull String raw, @NotNull GenericInteractionCreateEvent event) {
+        Channel channel = event.getChannel();
         if (channel == null) {
             return Optional.empty();
         }
 
-        return Helpers.resolveGuildChannel(context, raw).filter(ThreadChannel.class::isInstance).map(ThreadChannel.class::cast);
+        return Helpers.resolveGuildChannel(raw, event).filter(ThreadChannel.class::isInstance).map(ThreadChannel.class::cast);
     }
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/UserAdapter.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/UserAdapter.java
index 314f8cb59..c812e0505 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/UserAdapter.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/UserAdapter.java
@@ -1,10 +1,10 @@
 package com.github.kaktushose.jda.commands.dispatching.adapter.impl;
 
-import com.github.kaktushose.jda.commands.Helpers;
+import com.github.kaktushose.jda.commands.internal.Helpers;
 import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapter;
-import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
 import net.dv8tion.jda.api.JDA;
 import net.dv8tion.jda.api.entities.User;
+import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent;
 import net.dv8tion.jda.api.exceptions.ErrorResponseException;
 import org.jetbrains.annotations.NotNull;
 
@@ -20,15 +20,16 @@ public class UserAdapter implements TypeAdapter<User> {
     /**
      * Attempts to parse a String to a {@link User}. Accepts both the user id and name.
      *
-     * @param raw     the String to parse
-     * @param context the {@link Context}
+     * @param raw   the String to parse
+     * @param event the {@link GenericInteractionCreateEvent}
      * @return the parsed {@link User} or an empty Optional if the parsing fails
      */
+    @NotNull
     @Override
-    public Optional<User> apply(@NotNull String raw, @NotNull Context context) {
+    public Optional<User> apply(@NotNull String raw, @NotNull GenericInteractionCreateEvent event) {
         User user;
         raw = Helpers.sanitizeMention(raw);
-        JDA jda = context.getEvent().getJDA();
+        JDA jda = event.getJDA();
         if (raw.matches("\\d+")) {
             try {
                 user = jda.retrieveUserById(raw).complete();
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/VoiceChannelAdapter.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/VoiceChannelAdapter.java
index 6a804e3a2..21562b260 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/VoiceChannelAdapter.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/VoiceChannelAdapter.java
@@ -1,10 +1,10 @@
 package com.github.kaktushose.jda.commands.dispatching.adapter.impl;
 
-import com.github.kaktushose.jda.commands.Helpers;
+import com.github.kaktushose.jda.commands.internal.Helpers;
 import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapter;
-import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
 import net.dv8tion.jda.api.entities.channel.Channel;
 import net.dv8tion.jda.api.entities.channel.concrete.VoiceChannel;
+import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Optional;
@@ -19,17 +19,18 @@ public class VoiceChannelAdapter implements TypeAdapter<VoiceChannel> {
     /**
      * Attempts to parse a String to a {@link VoiceChannel}. Accepts both the channel id and name.
      *
-     * @param raw     the String to parse
-     * @param context the {@link Context}
+     * @param raw   the String to parse
+     * @param event the {@link GenericInteractionCreateEvent}
      * @return the parsed {@link VoiceChannel} or an empty Optional if the parsing fails
      */
+    @NotNull
     @Override
-    public Optional<VoiceChannel> apply(@NotNull String raw, @NotNull Context context) {
-        Channel channel = context.getEvent().getChannel();
+    public Optional<VoiceChannel> apply(@NotNull String raw, @NotNull GenericInteractionCreateEvent event) {
+        Channel channel = event.getChannel();
         if (channel == null) {
             return Optional.empty();
         }
 
-        return Helpers.resolveGuildChannel(context, raw).filter(VoiceChannel.class::isInstance).map(VoiceChannel.class::cast);
+        return Helpers.resolveGuildChannel(raw, event).filter(VoiceChannel.class::isInstance).map(VoiceChannel.class::cast);
     }
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/context/InvocationContext.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/context/InvocationContext.java
new file mode 100644
index 000000000..95e9cafd8
--- /dev/null
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/context/InvocationContext.java
@@ -0,0 +1,33 @@
+package com.github.kaktushose.jda.commands.dispatching.context;
+
+import com.github.kaktushose.jda.commands.dispatching.reply.MessageReply;
+import com.github.kaktushose.jda.commands.reflect.interactions.GenericInteractionDefinition;
+import com.github.kaktushose.jda.commands.reflect.interactions.ReplyConfig;
+import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent;
+import net.dv8tion.jda.api.utils.messages.MessageCreateData;
+
+import java.util.SequencedCollection;
+
+/// Bundles data that is important for the execution of an interaction, especially for invoking the user defined method.
+///
+/// @param <T>           The used type of [GenericInteractionCreateEvent]
+/// @param event         the underlying jda event
+/// @param keyValueStore the [KeyValueStore] belonging to this interaction over its whole lifetime
+/// @param arguments     the arguments used to call the final user defined method via [GenericInteractionDefinition#invoke(java.lang.Object, com.github.kaktushose.jda.commands.dispatching.context.InvocationContext)]
+/// @param definition    the [GenericInteractionDefinition] defining this interaction (referring to the user defined method)
+public record InvocationContext<T extends GenericInteractionCreateEvent>(
+        T event,
+        KeyValueStore keyValueStore,
+        GenericInteractionDefinition definition,
+        SequencedCollection<Object> arguments
+) {
+    /// Stops further execution of this invocation at the next suitable moment.
+    ///
+    /// @implNote This will interrupt the current event thread
+    /// @param errorMessage the error message that should be sent to the user as a reply
+    public void cancel(MessageCreateData errorMessage) {
+        new MessageReply(event, definition, new ReplyConfig()).reply(errorMessage);
+
+        Thread.currentThread().interrupt();
+    }
+}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/KeyValueStore.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/context/KeyValueStore.java
similarity index 88%
rename from src/main/java/com/github/kaktushose/jda/commands/dispatching/KeyValueStore.java
rename to src/main/java/com/github/kaktushose/jda/commands/dispatching/context/KeyValueStore.java
index 801903e8f..cb4377f68 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/KeyValueStore.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/context/KeyValueStore.java
@@ -1,10 +1,10 @@
-package com.github.kaktushose.jda.commands.dispatching;
+package com.github.kaktushose.jda.commands.dispatching.context;
 
 import org.jetbrains.annotations.NotNull;
 
+import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
-import java.util.concurrent.ConcurrentHashMap;
 
 /**
  * A simple key-value-store to store variables between events.
@@ -13,11 +13,7 @@
  */
 public class KeyValueStore {
 
-    private final Map<String, Object> values;
-
-    public KeyValueStore() {
-        values = new ConcurrentHashMap<>();
-    }
+    private final Map<String, Object> values = new HashMap<>();
 
     /**
      * Gets a value.
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/context/package-info.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/context/package-info.java
new file mode 100644
index 000000000..b4cc1ac0c
--- /dev/null
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/context/package-info.java
@@ -0,0 +1,2 @@
+/// Context objects that are bound to every event handling.
+package com.github.kaktushose.jda.commands.dispatching.context;
\ No newline at end of file
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/Event.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/Event.java
new file mode 100644
index 000000000..ac3f2db1e
--- /dev/null
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/Event.java
@@ -0,0 +1,210 @@
+package com.github.kaktushose.jda.commands.dispatching.events;
+
+import com.github.kaktushose.jda.commands.annotations.interactions.EntitySelectMenu;
+import com.github.kaktushose.jda.commands.annotations.interactions.StringSelectMenu;
+import com.github.kaktushose.jda.commands.dispatching.events.interactions.ComponentEvent;
+import com.github.kaktushose.jda.commands.dispatching.events.interactions.ModalEvent;
+import com.github.kaktushose.jda.commands.dispatching.internal.Runtime;
+import com.github.kaktushose.jda.commands.dispatching.context.KeyValueStore;
+import com.github.kaktushose.jda.commands.dispatching.events.interactions.AutoCompleteEvent;
+import com.github.kaktushose.jda.commands.dispatching.events.interactions.CommandEvent;
+import com.github.kaktushose.jda.commands.dispatching.middleware.Middleware;
+import com.github.kaktushose.jda.commands.reflect.InteractionRegistry;
+import com.github.kaktushose.jda.commands.reflect.interactions.components.ButtonDefinition;
+import com.github.kaktushose.jda.commands.reflect.interactions.components.menus.GenericSelectMenuDefinition;
+import net.dv8tion.jda.api.JDA;
+import net.dv8tion.jda.api.entities.Entitlement;
+import net.dv8tion.jda.api.entities.Guild;
+import net.dv8tion.jda.api.entities.Member;
+import net.dv8tion.jda.api.entities.User;
+import net.dv8tion.jda.api.entities.channel.Channel;
+import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent;
+import net.dv8tion.jda.api.interactions.DiscordLocale;
+import net.dv8tion.jda.api.interactions.Interaction;
+import net.dv8tion.jda.api.interactions.components.buttons.Button;
+import net.dv8tion.jda.api.interactions.components.selections.SelectMenu;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.List;
+
+
+/// Abstract base event for all interaction events, like [CommandEvent].
+///
+/// This class also holds the [GenericInteractionCreateEvent] and provides some shortcut methods to directly access its
+/// content.
+///
+///
+/// @param <T> the type of [GenericInteractionCreateEvent] this event represents
+/// @see AutoCompleteEvent
+/// @see CommandEvent
+/// @see ComponentEvent
+/// @see ModalEvent
+/// @since 4.0.0
+public abstract sealed class Event<T extends GenericInteractionCreateEvent> implements Interaction
+        permits ReplyableEvent, AutoCompleteEvent {
+
+    protected final T event;
+    protected final InteractionRegistry interactionRegistry;
+    private final Runtime runtime;
+
+    /// Constructs a new Event.
+    ///
+    /// @param event               the subtype [T] of [GenericInteractionCreateEvent]
+    /// @param interactionRegistry the corresponding [InteractionRegistry]
+    /// @param runtime             the [Runtime] this event lives in
+    protected Event(@NotNull T event, @NotNull InteractionRegistry interactionRegistry, @NotNull Runtime runtime) {
+        this.event = event;
+        this.interactionRegistry = interactionRegistry;
+        this.runtime = runtime;
+    }
+
+    /// Returns the underlying [GenericInteractionCreateEvent] of this event
+    ///
+    /// @return the [GenericInteractionCreateEvent]
+    @NotNull
+    public T jdaEvent() {
+        return this.event;
+    }
+
+    /// Gets a [`Button`][com.github.kaktushose.jda.commands.annotations.interactions.Button] based on the method name
+    /// and transforms it into a JDA [Button].
+    ///
+    /// The button will be linked to the current [`Runtime`]({@docRoot}/index.html#runtime-concept-heading). This may be useful if you want to send a component without
+    /// using the framework.
+    ///
+    /// @param button the name of the button
+    /// @return the JDA [Button]
+    @NotNull
+    public Button getButton(@NotNull String button) {
+        if (!button.matches("[a-zA-Z]+\\.[a-zA-Z]+")) {
+            throw new IllegalArgumentException("Unknown Button");
+        }
+
+        String sanitizedId = button.replaceAll("\\.", "");
+        ButtonDefinition buttonDefinition = interactionRegistry.getButtons().stream()
+                .filter(it -> it.getDefinitionId().equals(sanitizedId))
+                .findFirst().orElseThrow(() -> new IllegalArgumentException("Unknown Button"));
+
+        return buttonDefinition.toButton().withId(buttonDefinition.boundCustomId(runtimeId()));
+    }
+
+    /// Gets a [StringSelectMenu] or [EntitySelectMenu] based on the method name and transforms it into a JDA [SelectMenu].
+    ///
+    /// The select menu will be linked to the current [`Runtime`]({@docRoot}/index.html#runtime-concept-heading). This may be useful if you want to send a component
+    /// without using the framework.
+    ///
+    /// @param menu the name of the select menu
+    /// @return the JDA [SelectMenu]
+    @NotNull
+    public SelectMenu getSelectMenu(@NotNull String menu) {
+        if (!menu.matches("[a-zA-Z]+\\.[a-zA-Z]+")) {
+            throw new IllegalArgumentException("Unknown Select Menu");
+        }
+
+        String sanitizedId = menu.replaceAll("\\.", "");
+        GenericSelectMenuDefinition<?> selectMenuDefinition = interactionRegistry.getSelectMenus().stream()
+                .filter(it -> it.getDefinitionId().equals(sanitizedId))
+                .findFirst().orElseThrow(() -> new IllegalArgumentException("Unknown Select Menu"));
+
+        return selectMenuDefinition.toSelectMenu(runtimeId(), true);
+    }
+
+    /// Returns the id of the [`Runtime`]({@docRoot}/index.html#runtime-concept-heading) this event is dispatched in.
+    ///
+    ///
+    /// @return the id of the current [`Runtime`]({@docRoot}/index.html#runtime-concept-heading)
+    @NotNull
+    public String runtimeId() {
+        return runtime.id();
+    }
+
+    /// Closes the underlying [`Runtime`]({@docRoot}/index.html#runtime-concept-heading). This will ignore any new jda events belonging to this interaction, resulting
+    /// in the freeing of occupied resources for gc.
+    ///
+    /// This is only needed if the expiration strategy
+    /// [com.github.kaktushose.jda.commands.dispatching.ExpirationStrategy.Explicit] is used.
+    public void closeRuntime() {
+        runtime.close();
+    }
+
+    /// Returns the [KeyValueStore] of this [`Runtime`]({@docRoot}/index.html#runtime-concept-heading).
+    ///
+    /// The [KeyValueStore] can be accessed during the [Middleware] execution as well as any
+    /// interaction execution. Its content will be the same as long as the executions take place in the same [`Runtime`]({@docRoot}/index.html#runtime-concept-heading).
+    ///
+    /// @return the [KeyValueStore]
+    @NotNull
+    public KeyValueStore kv() {
+        return runtime.keyValueStore();
+    }
+
+
+    @Override
+    public int getTypeRaw() {
+        return event.getTypeRaw();
+    }
+
+    @NotNull
+    @Override
+    public String getToken() {
+        return event.getToken();
+    }
+
+    @Nullable
+    @Override
+    public Guild getGuild() {
+        return event.getGuild();
+    }
+
+    @NotNull
+    @Override
+    public User getUser() {
+        return event.getUser();
+    }
+
+    @Nullable
+    @Override
+    public Member getMember() {
+        return event.getMember();
+    }
+
+    @Override
+    public boolean isAcknowledged() {
+        return event.isAcknowledged();
+    }
+
+    @Nullable
+    @Override
+    public Channel getChannel() {
+        return event.getChannel();
+    }
+
+    @Override
+    public long getChannelIdLong() {
+        return event.getChannelIdLong();
+    }
+
+    @NotNull
+    @Override
+    public DiscordLocale getUserLocale() {
+        return event.getUserLocale();
+    }
+
+    @NotNull
+    @Override
+    public List<Entitlement> getEntitlements() {
+        return event.getEntitlements();
+    }
+
+    @NotNull
+    @Override
+    public JDA getJDA() {
+        return event.getJDA();
+    }
+
+    @Override
+    public long getIdLong() {
+        return event.getIdLong();
+    }
+}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/ModalReplyableEvent.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/ModalReplyableEvent.java
new file mode 100644
index 000000000..670eec8f1
--- /dev/null
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/ModalReplyableEvent.java
@@ -0,0 +1,60 @@
+package com.github.kaktushose.jda.commands.dispatching.events;
+
+import com.github.kaktushose.jda.commands.annotations.interactions.Modal;
+import com.github.kaktushose.jda.commands.dispatching.internal.Runtime;
+import com.github.kaktushose.jda.commands.dispatching.events.interactions.CommandEvent;
+import com.github.kaktushose.jda.commands.dispatching.events.interactions.ComponentEvent;
+import com.github.kaktushose.jda.commands.reflect.InteractionRegistry;
+import com.github.kaktushose.jda.commands.reflect.interactions.EphemeralInteractionDefinition;
+import com.github.kaktushose.jda.commands.reflect.interactions.ModalDefinition;
+import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent;
+import net.dv8tion.jda.api.interactions.callbacks.IModalCallback;
+import org.jetbrains.annotations.NotNull;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/// Subtype of [ReplyableEvent] that also supports replying with a [Modal].
+///
+///
+/// @param <T> the type of [GenericInteractionCreateEvent] this event represents
+/// @see CommandEvent
+/// @see ComponentEvent
+/// @since 4.0.0
+public abstract sealed class ModalReplyableEvent<T extends GenericInteractionCreateEvent>
+        extends ReplyableEvent<T>
+        permits CommandEvent, ComponentEvent {
+
+    private static final Logger log = LoggerFactory.getLogger(ModalReplyableEvent.class);
+
+    /// Constructs a new ModalReplyableEvent.
+    ///
+    /// @param event               the subtype [T] of [GenericInteractionCreateEvent]
+    /// @param interactionRegistry the corresponding [InteractionRegistry]
+    /// @param runtime             the [Runtime] this event lives in
+    /// @param definition          the [EphemeralInteractionDefinition] this event belongs to
+    protected ModalReplyableEvent(@NotNull T event,
+                                  @NotNull InteractionRegistry interactionRegistry,
+                                  @NotNull Runtime runtime,
+                                  @NotNull EphemeralInteractionDefinition definition) {
+        super(event, interactionRegistry, runtime, definition);
+    }
+
+    /// Acknowledgement of this event with a [Modal]. This will open a popup on the target user's Discord client.
+    ///
+    /// @param modal the method name of the [Modal] you want to reply with
+    /// @throws IllegalArgumentException if no [Modal] with the given name was found
+    public void replyModal(@NotNull String modal) {
+        if (event instanceof IModalCallback callback) {
+            var definitionId = String.valueOf((definition.getMethod().getDeclaringClass().getName() + modal).hashCode());
+            var modalDefinition = interactionRegistry.find(ModalDefinition.class, false, it ->
+                    it.getDefinitionId().equals(definitionId)
+            );
+            log.debug("Replying to interaction \"{}\" with Modal: \"{}\". [Runtime={}]", definition.getDisplayName(), modalDefinition.getDisplayName(), runtimeId());
+            callback.replyModal(modalDefinition.toModal(runtimeId())).queue();
+        } else {
+            throw new IllegalStateException(
+                    String.format("Cannot reply to '%s'! Please report this error to the jda-commands devs!", event.getClass().getName())
+            );
+        }
+    }
+}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/ReplyableEvent.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/ReplyableEvent.java
new file mode 100644
index 000000000..79832ab65
--- /dev/null
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/ReplyableEvent.java
@@ -0,0 +1,105 @@
+package com.github.kaktushose.jda.commands.dispatching.events;
+
+import com.github.kaktushose.jda.commands.dispatching.events.interactions.CommandEvent;
+import com.github.kaktushose.jda.commands.dispatching.events.interactions.ComponentEvent;
+import com.github.kaktushose.jda.commands.dispatching.internal.Runtime;
+import com.github.kaktushose.jda.commands.dispatching.events.interactions.ModalEvent;
+import com.github.kaktushose.jda.commands.dispatching.reply.ConfigurableReply;
+import com.github.kaktushose.jda.commands.dispatching.reply.MessageReply;
+import com.github.kaktushose.jda.commands.dispatching.reply.Reply;
+import com.github.kaktushose.jda.commands.reflect.InteractionRegistry;
+import com.github.kaktushose.jda.commands.reflect.interactions.EphemeralInteractionDefinition;
+import com.github.kaktushose.jda.commands.reflect.interactions.ReplyConfig;
+import net.dv8tion.jda.api.EmbedBuilder;
+import net.dv8tion.jda.api.entities.Message;
+import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent;
+import net.dv8tion.jda.api.interactions.callbacks.IReplyCallback;
+import net.dv8tion.jda.api.utils.messages.MessageCreateData;
+import org.jetbrains.annotations.NotNull;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/// Subtype of [Event] that supports replying to the [GenericInteractionCreateEvent] with text messages.
+///
+/// You can either reply directly by using one of the `reply` methods, like [#reply(String)], or you can call
+/// [#with()] to use a [ConfigurableReply] to append components or override reply settings from the
+/// [`ReplyConfig`][com.github.kaktushose.jda.commands.annotations.interactions.ReplyConfig].
+///
+/// Example:
+/// ```
+/// public void onInteraction(ReplayableEvent<?> event) {
+///     event.reply("Hello World");
+/// }
+/// ```
+///
+/// @since 4.0.0
+/// @see ModalEvent
+/// @see CommandEvent
+/// @see ComponentEvent
+/// @since 4.0.0
+public sealed abstract class ReplyableEvent<T extends GenericInteractionCreateEvent> extends Event<T> implements Reply
+        permits ModalEvent, ModalReplyableEvent {
+
+    private static final Logger log = LoggerFactory.getLogger(ReplyableEvent.class);
+    protected final EphemeralInteractionDefinition definition;
+    private final ReplyConfig replyConfig;
+
+    /// Constructs a new ReplyableEvent.
+    ///
+    /// @param event               the subtype [T] of [GenericInteractionCreateEvent]
+    /// @param interactionRegistry the corresponding [InteractionRegistry]
+    /// @param runtime             the [Runtime] this event lives in
+    /// @param definition          the [EphemeralInteractionDefinition] this event belongs to
+    protected ReplyableEvent(T event,
+                             InteractionRegistry interactionRegistry,
+                             Runtime runtime,
+                             EphemeralInteractionDefinition definition) {
+        super(event, interactionRegistry, runtime);
+        this.replyConfig = definition.replyConfig();
+        this.definition = definition;
+    }
+
+    /// Removes all components from the original message.
+    ///
+    /// The original message is the message, from which this event (interaction) originates. For example if this event is a ButtonEvent, the original message will be the message to which the pressed button is attached to.
+    public void removeComponents() {
+        log.debug("Reply Debug: Removing components from original message");
+        if (event instanceof IReplyCallback callback) {
+            if (!event.isAcknowledged()) {
+                callback.deferReply(replyConfig.ephemeral()).queue();
+            }
+            callback.getHook().editOriginalComponents().queue();
+        }
+    }
+
+    /// Entry point for configuring a reply.
+    ///
+    /// Returns a new [ConfigurableReply] that can be used to append components or override reply settings.
+    ///
+    /// @return [ConfigurableReply]
+    /// @see [ConfigurableReply]
+    @NotNull
+    public ConfigurableReply with() {
+        return new ConfigurableReply(newReply(), interactionRegistry, runtimeId());
+    }
+
+    @NotNull
+    public Message reply(@NotNull String message) {
+        return newReply().reply(message);
+    }
+
+    @NotNull
+    public Message reply(@NotNull MessageCreateData message) {
+        return newReply().reply(message);
+    }
+
+    @NotNull
+    public Message reply(@NotNull EmbedBuilder builder) {
+        return newReply().reply(builder);
+    }
+
+    private MessageReply newReply() {
+        log.debug("Reply Debug: [Runtime={}]", runtimeId());
+        return new MessageReply(event, definition);
+    }
+}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/autocomplete/AutoCompleteEvent.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/interactions/AutoCompleteEvent.java
similarity index 89%
rename from src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/autocomplete/AutoCompleteEvent.java
rename to src/main/java/com/github/kaktushose/jda/commands/dispatching/events/interactions/AutoCompleteEvent.java
index 425738cdb..8484a9f37 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/autocomplete/AutoCompleteEvent.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/interactions/AutoCompleteEvent.java
@@ -1,13 +1,14 @@
-package com.github.kaktushose.jda.commands.dispatching.interactions.autocomplete;
+package com.github.kaktushose.jda.commands.dispatching.events.interactions;
 
-import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
-import com.github.kaktushose.jda.commands.dispatching.interactions.GenericEvent;
+import com.github.kaktushose.jda.commands.dispatching.internal.Runtime;
+import com.github.kaktushose.jda.commands.dispatching.events.Event;
 import com.github.kaktushose.jda.commands.reflect.InteractionRegistry;
 import net.dv8tion.jda.api.events.interaction.command.CommandAutoCompleteInteractionEvent;
 import net.dv8tion.jda.api.interactions.commands.Command;
 import net.dv8tion.jda.api.interactions.commands.CommandAutoCompleteInteraction;
 import net.dv8tion.jda.api.interactions.commands.OptionType;
 import net.dv8tion.jda.api.interactions.commands.build.OptionData;
+import org.jetbrains.annotations.NotNull;
 
 import javax.annotation.Nonnull;
 import java.util.Arrays;
@@ -15,19 +16,25 @@
 import java.util.stream.Collectors;
 
 /**
- * This class is a subclass of {@link GenericEvent}.
+ * This class is a subclass of {@link Event}.
  * It provides additional features for replying to a {@link CommandAutoCompleteInteractionEvent}.
  *
- * @see GenericEvent
+ * @see Event
  * @since 4.0.0
  */
-public class AutoCompleteEvent extends GenericEvent {
+public final class AutoCompleteEvent extends Event<CommandAutoCompleteInteractionEvent> {
 
-    private final CommandAutoCompleteInteractionEvent event;
-
-    protected AutoCompleteEvent(Context context, InteractionRegistry interactionRegistry) {
-        super(context, interactionRegistry);
-        event = (CommandAutoCompleteInteractionEvent) context.getEvent();
+    /**
+     * Constructs a new AutoCompleteEvent.
+     *
+     * @param event               the {@link CommandAutoCompleteInteractionEvent} this event holds
+     * @param interactionRegistry the corresponding {@link InteractionRegistry}
+     * @param runtime             the corresponding {@link Runtime}
+     */
+    public AutoCompleteEvent(@NotNull CommandAutoCompleteInteractionEvent event,
+                             @NotNull InteractionRegistry interactionRegistry,
+                             @NotNull Runtime runtime) {
+        super(event, interactionRegistry, runtime);
     }
 
     /**
@@ -45,7 +52,7 @@ protected AutoCompleteEvent(Context context, InteractionRegistry interactionRegi
      *
      *                                  </ul>
      */
-    public void replyChoices(@Nonnull Collection<Command.Choice> choices) {
+    public void replyChoices(@NotNull Collection<Command.Choice> choices) {
         event.replyChoices(choices).queue();
     }
 
@@ -63,7 +70,7 @@ public void replyChoices(@Nonnull Collection<Command.Choice> choices) {
      *                                  <li>If the string value of any of the choices is empty or longer than {@value OptionData#MAX_CHOICE_VALUE_LENGTH}</li>
      *                                  </ul>
      */
-    public void replyChoices(@Nonnull Command.Choice... choices) {
+    public void replyChoices(@NotNull Command.Choice... choices) {
         replyChoices(Arrays.asList(choices));
     }
 
@@ -99,7 +106,7 @@ public void replyChoice(@Nonnull String name, @Nonnull String value) {
      *                                  <li>If the value of is not between {@value OptionData#MIN_NEGATIVE_NUMBER} and {@value OptionData#MAX_POSITIVE_NUMBER}</li>
      *                                  </ul>
      */
-    public void replyChoice(@Nonnull String name, long value) {
+    public void replyChoice(@NotNull String name, long value) {
         replyChoices(new Command.Choice(name, value));
     }
 
@@ -117,7 +124,7 @@ public void replyChoice(@Nonnull String name, long value) {
      *                                  <li>If the value of is not between {@value OptionData#MIN_NEGATIVE_NUMBER} and {@value OptionData#MAX_POSITIVE_NUMBER}</li>
      *                                  </ul>
      */
-    public void replyChoice(@Nonnull String name, double value) {
+    public void replyChoice(@NotNull String name, double value) {
         replyChoices(new Command.Choice(name, value));
     }
 
@@ -135,7 +142,7 @@ public void replyChoice(@Nonnull String name, double value) {
      *                                  <li>If the string value of any of the choices is empty or longer than {@value OptionData#MAX_CHOICE_VALUE_LENGTH}</li>
      *                                  </ul>
      */
-    public void replyChoiceStrings(@Nonnull String... choices) {
+    public void replyChoiceStrings(@NotNull String... choices) {
         replyChoices(Arrays.stream(choices).map(it -> new Command.Choice(it, it)).collect(Collectors.toList()));
     }
 
@@ -153,7 +160,7 @@ public void replyChoiceStrings(@Nonnull String... choices) {
      *                                  <li>If the string value of any of the choices is empty or longer than {@value OptionData#MAX_CHOICE_VALUE_LENGTH}</li>
      *                                  </ul>
      */
-    public void replyChoiceStrings(@Nonnull Collection<String> choices) {
+    public void replyChoiceStrings(@NotNull Collection<String> choices) {
         replyChoices(choices.stream().map(it -> new Command.Choice(it, it)).collect(Collectors.toList()));
     }
 
@@ -171,7 +178,7 @@ public void replyChoiceStrings(@Nonnull Collection<String> choices) {
      *                                  <li>If the numeric value of any of the choices is not between {@value OptionData#MIN_NEGATIVE_NUMBER} and {@value OptionData#MAX_POSITIVE_NUMBER}</li>
      *                                  </ul>
      */
-    public void replyChoiceLongs(@Nonnull long... choices) {
+    public void replyChoiceLongs(long... choices) {
         replyChoices(Arrays.stream(choices).mapToObj(it -> new Command.Choice(String.valueOf(it), it)).collect(Collectors.toList()));
     }
 
@@ -189,7 +196,7 @@ public void replyChoiceLongs(@Nonnull long... choices) {
      *                                  <li>If the numeric value of any of the choices is not between {@value OptionData#MIN_NEGATIVE_NUMBER} and {@value OptionData#MAX_POSITIVE_NUMBER}</li>
      *                                  </ul>
      */
-    public void replyChoiceLongs(@Nonnull Collection<Long> choices) {
+    public void replyChoiceLongs(@NotNull Collection<Long> choices) {
         replyChoices(choices.stream().map(it -> new Command.Choice(String.valueOf(it), it)).collect(Collectors.toList()));
     }
 
@@ -208,7 +215,7 @@ public void replyChoiceLongs(@Nonnull Collection<Long> choices) {
      *                                  </ul>
      */
 
-    public void replyChoiceDoubles(@Nonnull double... choices) {
+    public void replyChoiceDoubles(double... choices) {
         replyChoices(Arrays.stream(choices).mapToObj(it -> new Command.Choice(String.valueOf(it), it)).collect(Collectors.toList()));
     }
 
@@ -227,7 +234,7 @@ public void replyChoiceDoubles(@Nonnull double... choices) {
      *                                  </ul>
      */
 
-    public void replyChoiceDoubles(@Nonnull Collection<Double> choices) {
+    public void replyChoiceDoubles(@NotNull Collection<Double> choices) {
         replyChoices(choices.stream().map(it -> new Command.Choice(String.valueOf(it), it)).collect(Collectors.toList()));
     }
 
@@ -236,7 +243,7 @@ public void replyChoiceDoubles(@Nonnull Collection<Double> choices) {
      *
      * @return The option name
      */
-    @Nonnull
+    @NotNull
     public String getName() {
         return event.getFocusedOption().getName();
     }
@@ -249,7 +256,7 @@ public String getName() {
      *
      * @return The current auto-completable query value
      */
-    @Nonnull
+    @NotNull
     public String getValue() {
         return event.getFocusedOption().getValue();
     }
@@ -259,7 +266,7 @@ public String getValue() {
      *
      * @return The option type expected from this auto-complete response
      */
-    @Nonnull
+    @NotNull
     public OptionType getOptionType() {
         return event.getFocusedOption().getType();
     }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/interactions/CommandEvent.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/interactions/CommandEvent.java
new file mode 100644
index 000000000..9bd940fcc
--- /dev/null
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/interactions/CommandEvent.java
@@ -0,0 +1,42 @@
+package com.github.kaktushose.jda.commands.dispatching.events.interactions;
+
+import com.github.kaktushose.jda.commands.dispatching.internal.Runtime;
+import com.github.kaktushose.jda.commands.dispatching.events.Event;
+import com.github.kaktushose.jda.commands.dispatching.events.ModalReplyableEvent;
+import com.github.kaktushose.jda.commands.reflect.InteractionRegistry;
+import com.github.kaktushose.jda.commands.reflect.interactions.EphemeralInteractionDefinition;
+import net.dv8tion.jda.api.events.interaction.command.GenericCommandInteractionEvent;
+import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
+import org.jetbrains.annotations.NotNull;
+
+/// This class is a subclass of [Event]. It provides additional features for replying to a [GenericCommandInteractionEvent].
+///
+/// @see Event
+/// @see ModalReplyableEvent
+/// @since 4.0.0
+public final class CommandEvent extends ModalReplyableEvent<GenericCommandInteractionEvent> {
+
+    /// Constructs a new CommandEvent.
+    ///
+    /// @param event               the [GenericCommandInteractionEvent] this event holds
+    /// @param interactionRegistry the corresponding [InteractionRegistry]
+    /// @param runtime             the corresponding [Runtime]
+    /// @param definition          the corresponding [EphemeralInteractionDefinition]
+    public CommandEvent(@NotNull GenericCommandInteractionEvent event,
+                        @NotNull InteractionRegistry interactionRegistry,
+                        @NotNull Runtime runtime,
+                        @NotNull EphemeralInteractionDefinition definition) {
+        super(event, interactionRegistry, runtime, definition);
+    }
+
+    /// Returns the underlying [GenericCommandInteractionEvent] and casts it to the given type.
+    ///
+    /// @param type a subtype of [GenericCommandInteractionEvent], like [SlashCommandInteractionEvent]
+    /// @param <T>  a subtype of [GenericCommandInteractionEvent]
+    /// @return [T]
+    @NotNull
+    public <T extends GenericCommandInteractionEvent> T jdaEvent(@NotNull Class<T> type) {
+        return type.cast(event);
+    }
+
+}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/interactions/ComponentEvent.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/interactions/ComponentEvent.java
new file mode 100644
index 000000000..067744cf4
--- /dev/null
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/interactions/ComponentEvent.java
@@ -0,0 +1,43 @@
+package com.github.kaktushose.jda.commands.dispatching.events.interactions;
+
+import com.github.kaktushose.jda.commands.dispatching.internal.Runtime;
+import com.github.kaktushose.jda.commands.dispatching.events.Event;
+import com.github.kaktushose.jda.commands.dispatching.events.ModalReplyableEvent;
+import com.github.kaktushose.jda.commands.reflect.InteractionRegistry;
+import com.github.kaktushose.jda.commands.reflect.interactions.EphemeralInteractionDefinition;
+import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent;
+import net.dv8tion.jda.api.events.interaction.component.EntitySelectInteractionEvent;
+import net.dv8tion.jda.api.events.interaction.component.GenericComponentInteractionCreateEvent;
+import net.dv8tion.jda.api.events.interaction.component.StringSelectInteractionEvent;
+import org.jetbrains.annotations.NotNull;
+
+/// This class is a subclass of [Event]. It provides additional features for replying to a [GenericComponentInteractionCreateEvent].
+///
+/// @see Event
+/// @see ModalReplyableEvent
+/// @since 4.0.0
+public final class ComponentEvent extends ModalReplyableEvent<GenericComponentInteractionCreateEvent> {
+
+    /// Constructs a new CommandEvent.
+    ///
+    /// @param event               the [GenericComponentInteractionCreateEvent] this event holds
+    /// @param interactionRegistry the corresponding [InteractionRegistry]
+    /// @param runtime             the corresponding [Runtime]
+    /// @param definition          the corresponding [EphemeralInteractionDefinition]
+    public ComponentEvent(@NotNull GenericComponentInteractionCreateEvent event,
+                          @NotNull InteractionRegistry interactionRegistry,
+                          @NotNull Runtime runtime,
+                          @NotNull EphemeralInteractionDefinition definition) {
+        super(event, interactionRegistry, runtime, definition);
+    }
+
+    /// Returns the underlying [GenericComponentInteractionCreateEvent] and casts it to the given type.
+    ///
+    /// @param type a subtype of [GenericComponentInteractionCreateEvent], namely [ButtonInteractionEvent],
+    /// [EntitySelectInteractionEvent] or [StringSelectInteractionEvent]
+    /// @param <T>  a subtype of [GenericComponentInteractionCreateEvent]
+    /// @return [T]
+    public <T extends GenericComponentInteractionCreateEvent> T jdaEvent(Class<T> type) {
+        return type.cast(event);
+    }
+}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/interactions/ModalEvent.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/interactions/ModalEvent.java
new file mode 100644
index 000000000..c8f60a9a6
--- /dev/null
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/interactions/ModalEvent.java
@@ -0,0 +1,32 @@
+package com.github.kaktushose.jda.commands.dispatching.events.interactions;
+
+import com.github.kaktushose.jda.commands.dispatching.internal.Runtime;
+import com.github.kaktushose.jda.commands.dispatching.events.Event;
+import com.github.kaktushose.jda.commands.dispatching.events.ReplyableEvent;
+import com.github.kaktushose.jda.commands.reflect.InteractionRegistry;
+import com.github.kaktushose.jda.commands.reflect.interactions.EphemeralInteractionDefinition;
+import net.dv8tion.jda.api.events.interaction.ModalInteractionEvent;
+import net.dv8tion.jda.api.events.interaction.command.GenericCommandInteractionEvent;
+import org.jetbrains.annotations.NotNull;
+
+/// This class is a subclass of [Event]. It provides additional features for replying to a [ModalInteractionEvent].
+///
+/// @see Event
+/// @see ReplyableEvent
+/// @since 4.0.0
+public final class ModalEvent extends ReplyableEvent<ModalInteractionEvent> {
+
+    /// Constructs a new CommandEvent.
+    ///
+    /// @param event               the [GenericCommandInteractionEvent] this event holds
+    /// @param interactionRegistry the corresponding [InteractionRegistry]
+    /// @param runtime             the corresponding [Runtime]
+    /// @param definition          the corresponding [EphemeralInteractionDefinition]
+    public ModalEvent(@NotNull ModalInteractionEvent event,
+                      @NotNull InteractionRegistry interactionRegistry,
+                      @NotNull Runtime runtime,
+                      @NotNull EphemeralInteractionDefinition definition) {
+        super(event, interactionRegistry, runtime, definition);
+    }
+
+}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/interactions/package-info.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/interactions/package-info.java
new file mode 100644
index 000000000..323ac6561
--- /dev/null
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/interactions/package-info.java
@@ -0,0 +1,4 @@
+/// Event classes that represent an interaction execution.
+///
+/// @since 4.0.0
+package com.github.kaktushose.jda.commands.dispatching.events.interactions;
\ No newline at end of file
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/package-info.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/package-info.java
new file mode 100644
index 000000000..ea31d952d
--- /dev/null
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/package-info.java
@@ -0,0 +1,2 @@
+/// Abstract event classes that build the foundation for specific event implementations.
+package com.github.kaktushose.jda.commands.dispatching.events;
\ No newline at end of file
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/AutoCompleteHandler.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/AutoCompleteHandler.java
new file mode 100644
index 000000000..cc10b7d86
--- /dev/null
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/AutoCompleteHandler.java
@@ -0,0 +1,33 @@
+package com.github.kaktushose.jda.commands.dispatching.handling;
+
+import com.github.kaktushose.jda.commands.dispatching.internal.Runtime;
+import com.github.kaktushose.jda.commands.dispatching.context.InvocationContext;
+import com.github.kaktushose.jda.commands.dispatching.events.interactions.AutoCompleteEvent;
+import net.dv8tion.jda.api.events.interaction.command.CommandAutoCompleteInteractionEvent;
+import net.dv8tion.jda.api.interactions.commands.CommandAutoCompleteInteraction;
+import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.List;
+
+@ApiStatus.Internal
+public final class AutoCompleteHandler extends EventHandler<CommandAutoCompleteInteractionEvent> {
+
+    public AutoCompleteHandler(DispatchingContext dispatchingContext) {
+        super(dispatchingContext);
+    }
+
+    @Override
+    protected InvocationContext<CommandAutoCompleteInteractionEvent> prepare(@NotNull CommandAutoCompleteInteractionEvent event, @NotNull Runtime runtime) {
+        CommandAutoCompleteInteraction interaction = event.getInteraction();
+
+        return interactionRegistry.getAutoCompletes().stream()
+                .filter(it -> it.getCommandNames().stream().anyMatch(name -> interaction.getFullCommandName().startsWith(name)))
+                .findFirst()
+                .map(autoComplete -> new InvocationContext<>(event, runtime.keyValueStore(), autoComplete, List.of(new AutoCompleteEvent(event, interactionRegistry, runtime))))
+                .orElseGet(() -> {
+                    log.debug("No auto complete handler found for {}", interaction.getFullCommandName());
+                    return null;
+                });
+    }
+}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/ComponentHandler.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/ComponentHandler.java
new file mode 100644
index 000000000..1093eaad4
--- /dev/null
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/ComponentHandler.java
@@ -0,0 +1,52 @@
+package com.github.kaktushose.jda.commands.dispatching.handling;
+
+import com.github.kaktushose.jda.commands.dispatching.internal.Runtime;
+import com.github.kaktushose.jda.commands.dispatching.context.InvocationContext;
+import com.github.kaktushose.jda.commands.dispatching.events.interactions.ComponentEvent;
+import com.github.kaktushose.jda.commands.reflect.interactions.CustomId;
+import com.github.kaktushose.jda.commands.reflect.interactions.components.GenericComponentDefinition;
+import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent;
+import net.dv8tion.jda.api.events.interaction.component.EntitySelectInteractionEvent;
+import net.dv8tion.jda.api.events.interaction.component.GenericComponentInteractionCreateEvent;
+import net.dv8tion.jda.api.events.interaction.component.StringSelectInteractionEvent;
+import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@ApiStatus.Internal
+public final class ComponentHandler extends EventHandler<GenericComponentInteractionCreateEvent> {
+
+    public ComponentHandler(DispatchingContext dispatchingContext) {
+        super(dispatchingContext);
+    }
+
+    @Override
+    protected InvocationContext<GenericComponentInteractionCreateEvent> prepare(@NotNull GenericComponentInteractionCreateEvent genericEvent, @NotNull Runtime runtime) {
+        // ignore non jda-commands events
+        if (CustomId.isInvalid(genericEvent.getComponentId())) {
+            return null;
+        }
+
+        var component = interactionRegistry.find(GenericComponentDefinition.class, true, it ->
+                it.getDefinitionId().equals(CustomId.definitionId(genericEvent.getComponentId()))
+        );
+
+        List<Object> arguments = switch (genericEvent) {
+            case StringSelectInteractionEvent event -> new ArrayList<>(List.of(event.getValues()));
+            case EntitySelectInteractionEvent event -> new ArrayList<>(List.of(event.getMentions()));
+            case ButtonInteractionEvent _ -> new ArrayList<>();
+            default ->
+                    throw new IllegalStateException("Should not occur. Please report this error the the devs of jda-commands.");
+        };
+        arguments.addFirst(new ComponentEvent(genericEvent, interactionRegistry, runtime, component));
+
+        return new InvocationContext<>(
+                genericEvent,
+                runtime.keyValueStore(),
+                component,
+                arguments
+        );
+    }
+}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/DispatchingContext.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/DispatchingContext.java
new file mode 100644
index 000000000..83f5f09f5
--- /dev/null
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/DispatchingContext.java
@@ -0,0 +1,17 @@
+package com.github.kaktushose.jda.commands.dispatching.handling;
+
+import com.github.kaktushose.jda.commands.dispatching.ExpirationStrategy;
+import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapterRegistry;
+import com.github.kaktushose.jda.commands.dispatching.middleware.MiddlewareRegistry;
+import com.github.kaktushose.jda.commands.reflect.ImplementationRegistry;
+import com.github.kaktushose.jda.commands.reflect.InteractionRegistry;
+import org.jetbrains.annotations.ApiStatus;
+
+/// A collection of classes relevant for [EventHandler]s.
+@ApiStatus.Internal
+public record DispatchingContext(MiddlewareRegistry middlewareRegistry,
+                                 ImplementationRegistry implementationRegistry,
+                                 InteractionRegistry interactionRegistry,
+                                 TypeAdapterRegistry adapterRegistry,
+                                 ExpirationStrategy expirationStrategy) {
+}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/EventHandler.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/EventHandler.java
new file mode 100644
index 000000000..2919128e9
--- /dev/null
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/EventHandler.java
@@ -0,0 +1,106 @@
+package com.github.kaktushose.jda.commands.dispatching.handling;
+
+import com.github.kaktushose.jda.commands.dispatching.internal.Runtime;
+import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapterRegistry;
+import com.github.kaktushose.jda.commands.dispatching.context.InvocationContext;
+import com.github.kaktushose.jda.commands.dispatching.handling.command.ContextCommandHandler;
+import com.github.kaktushose.jda.commands.dispatching.handling.command.SlashCommandHandler;
+import com.github.kaktushose.jda.commands.dispatching.middleware.Middleware;
+import com.github.kaktushose.jda.commands.dispatching.middleware.MiddlewareRegistry;
+import com.github.kaktushose.jda.commands.dispatching.middleware.Priority;
+import com.github.kaktushose.jda.commands.reflect.ImplementationRegistry;
+import com.github.kaktushose.jda.commands.reflect.InteractionRegistry;
+import com.github.kaktushose.jda.commands.reflect.interactions.GenericInteractionDefinition;
+import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent;
+import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.SequencedCollection;
+import java.util.function.BiConsumer;
+
+/// Implementations of this class are handling specific [GenericInteractionCreateEvent]s.
+///
+/// Each [EventHandler] is split into 3 steps:
+/// 1. Preparation ([EventHandler#prepare(GenericInteractionCreateEvent, Runtime)]):
+/// In this step the [InvocationContext] is created from the jda event and the involved [Runtime].
+///
+/// 2. Middleware execution: In this step all registered [Middleware]s
+/// are executed ordered by their [Priority].
+///
+/// 3. Invocation ([EventHandler#invoke(InvocationContext, Runtime)]):
+/// In this step the user implemented method is called with help of the right [GenericInteractionDefinition]
+@ApiStatus.Internal
+public abstract sealed class EventHandler<T extends GenericInteractionCreateEvent>
+        implements BiConsumer<T, Runtime>
+        permits AutoCompleteHandler, ComponentHandler, ModalHandler, ContextCommandHandler, SlashCommandHandler {
+
+    public static final Logger log = LoggerFactory.getLogger(EventHandler.class);
+
+    protected final DispatchingContext dispatchingContext;
+    protected final MiddlewareRegistry middlewareRegistry;
+    protected final ImplementationRegistry implementationRegistry;
+    protected final InteractionRegistry interactionRegistry;
+    protected final TypeAdapterRegistry adapterRegistry;
+
+    public EventHandler(DispatchingContext dispatchingContext) {
+        this.dispatchingContext = dispatchingContext;
+        this.middlewareRegistry = dispatchingContext.middlewareRegistry();
+        this.implementationRegistry = dispatchingContext.implementationRegistry();
+        this.interactionRegistry = dispatchingContext.interactionRegistry();
+        this.adapterRegistry = dispatchingContext.adapterRegistry();
+    }
+
+    @Nullable
+    protected abstract InvocationContext<T> prepare(@NotNull T event, @NotNull Runtime runtime);
+
+    @Override
+    public final void accept(T e, Runtime runtime) {
+        log.debug("Got event {}", e);
+
+        InvocationContext<T> context = prepare(e, runtime);
+
+        if (context == null || Thread.interrupted()) {
+            log.debug("Interaction execution cancelled by preparation task");
+            return;
+        }
+
+        log.debug("Executing middlewares...");
+        middlewareRegistry.forAllOrdered(middleware -> {
+            log.debug("Executing middleware {}", middleware.getClass().getSimpleName());
+            middleware.accept(context);
+        });
+
+        if (Thread.interrupted()) {
+            log.debug("Interaction execution cancelled by middleware");
+            return;
+        }
+
+        invoke(context, runtime);
+    }
+
+    private void invoke(@NotNull InvocationContext<T> invocation, @NotNull Runtime runtime) {
+        SequencedCollection<Object> arguments = invocation.arguments();
+
+        var definition = invocation.definition();
+
+        log.info("Executing interaction \"{}\" for user \"{}\"", definition.getDisplayName(), invocation.event().getUser().getEffectiveName());
+        try {
+            log.debug("Invoking method \"{}.{}\" with following arguments: {}",
+                    definition.getMethod().getDeclaringClass().getName(),
+                    definition.getMethod().getName(),
+                    arguments
+            );
+            Object instance = runtime.instance(definition);
+            definition.invoke(instance, invocation);
+        } catch (Exception exception) {
+            log.error("Interaction execution failed!", exception);
+            // this unwraps the underlying error in case of an exception inside the command class
+            Throwable throwable = exception instanceof InvocationTargetException ? exception.getCause() : exception;
+            invocation.cancel(implementationRegistry.getErrorMessageFactory().getCommandExecutionFailedMessage(invocation.event(), throwable));
+        }
+    }
+}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/ModalHandler.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/ModalHandler.java
new file mode 100644
index 000000000..b055c33f1
--- /dev/null
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/ModalHandler.java
@@ -0,0 +1,43 @@
+package com.github.kaktushose.jda.commands.dispatching.handling;
+
+import com.github.kaktushose.jda.commands.dispatching.internal.Runtime;
+import com.github.kaktushose.jda.commands.dispatching.context.InvocationContext;
+import com.github.kaktushose.jda.commands.dispatching.events.interactions.ModalEvent;
+import com.github.kaktushose.jda.commands.reflect.interactions.CustomId;
+import com.github.kaktushose.jda.commands.reflect.interactions.ModalDefinition;
+import net.dv8tion.jda.api.events.interaction.ModalInteractionEvent;
+import net.dv8tion.jda.api.interactions.modals.ModalMapping;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+public final class ModalHandler extends EventHandler<ModalInteractionEvent> {
+
+    public ModalHandler(DispatchingContext dispatchingContext) {
+        super(dispatchingContext);
+    }
+
+    @Override
+    protected InvocationContext<ModalInteractionEvent> prepare(@NotNull ModalInteractionEvent event, @NotNull Runtime runtime) {
+        // ignore non jda-commands events
+        if (CustomId.isInvalid(event.getModalId())) {
+            return null;
+        }
+
+        var modal = interactionRegistry.find(ModalDefinition.class, true, it ->
+                it.getDefinitionId().equals(CustomId.definitionId(event.getModalId()))
+        );
+
+        List<Object> arguments = event.getValues().stream().map(ModalMapping::getAsString).collect(Collectors.toList());
+        arguments.addFirst(new ModalEvent(event, interactionRegistry, runtime, modal));
+
+        return new InvocationContext<>(
+                event,
+                runtime.keyValueStore(),
+                modal,
+                Collections.unmodifiableList(arguments)
+        );
+    }
+}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/command/ContextCommandHandler.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/command/ContextCommandHandler.java
new file mode 100644
index 000000000..5b782917c
--- /dev/null
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/command/ContextCommandHandler.java
@@ -0,0 +1,32 @@
+package com.github.kaktushose.jda.commands.dispatching.handling.command;
+
+import com.github.kaktushose.jda.commands.dispatching.internal.Runtime;
+import com.github.kaktushose.jda.commands.dispatching.context.InvocationContext;
+import com.github.kaktushose.jda.commands.dispatching.events.interactions.CommandEvent;
+import com.github.kaktushose.jda.commands.dispatching.handling.EventHandler;
+import com.github.kaktushose.jda.commands.dispatching.handling.DispatchingContext;
+import com.github.kaktushose.jda.commands.reflect.interactions.commands.ContextCommandDefinition;
+import net.dv8tion.jda.api.events.interaction.command.GenericContextInteractionEvent;
+import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.List;
+
+@ApiStatus.Internal
+public final class ContextCommandHandler extends EventHandler<GenericContextInteractionEvent<?>> {
+
+    public ContextCommandHandler(DispatchingContext dispatchingContext) {
+        super(dispatchingContext);
+    }
+
+    @Override
+    protected InvocationContext<GenericContextInteractionEvent<?>> prepare(@NotNull GenericContextInteractionEvent<?> event, @NotNull Runtime runtime) {
+        ContextCommandDefinition command = interactionRegistry.find(ContextCommandDefinition.class, true, it ->
+                it.getName().equals(event.getFullCommandName())
+        );
+
+        return new InvocationContext<>(event, runtime.keyValueStore(), command,
+                List.of(new CommandEvent(event, interactionRegistry, runtime, command), event.getTarget())
+        );
+    }
+}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/command/SlashCommandHandler.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/command/SlashCommandHandler.java
new file mode 100644
index 000000000..34f1efa65
--- /dev/null
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/command/SlashCommandHandler.java
@@ -0,0 +1,107 @@
+package com.github.kaktushose.jda.commands.dispatching.handling.command;
+
+import com.github.kaktushose.jda.commands.dispatching.internal.Runtime;
+import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapter;
+import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapterRegistry;
+import com.github.kaktushose.jda.commands.dispatching.context.InvocationContext;
+import com.github.kaktushose.jda.commands.dispatching.events.interactions.CommandEvent;
+import com.github.kaktushose.jda.commands.dispatching.handling.EventHandler;
+import com.github.kaktushose.jda.commands.dispatching.handling.DispatchingContext;
+import com.github.kaktushose.jda.commands.dispatching.reply.MessageReply;
+import com.github.kaktushose.jda.commands.embeds.error.ErrorMessageFactory;
+import com.github.kaktushose.jda.commands.reflect.ParameterDefinition;
+import com.github.kaktushose.jda.commands.reflect.interactions.commands.SlashCommandDefinition;
+import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
+import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+
+@ApiStatus.Internal
+public final class SlashCommandHandler extends EventHandler<SlashCommandInteractionEvent> {
+
+    public SlashCommandHandler(DispatchingContext dispatchingContext) {
+        super(dispatchingContext);
+    }
+
+    @Override
+    protected InvocationContext<SlashCommandInteractionEvent> prepare(@NotNull SlashCommandInteractionEvent event, @NotNull Runtime runtime) {
+        SlashCommandDefinition command = interactionRegistry.find(SlashCommandDefinition.class, true, it ->
+                it.getName().equals(event.getFullCommandName())
+        );
+
+        return parseArguments(command, event, runtime)
+                .map(args -> new InvocationContext<>(event, runtime.keyValueStore(), command, args))
+                .orElse(null);
+
+    }
+
+    private Optional<List<Object>> parseArguments(SlashCommandDefinition command, SlashCommandInteractionEvent event, Runtime runtime) {
+        var input = command.getActualParameters().stream()
+                .map(it -> event.getOption(it.name()).getAsString())
+                .toArray(String[]::new);
+
+        List<Object> arguments = new ArrayList<>();
+        arguments.addFirst(new CommandEvent(event, interactionRegistry, runtime, command));
+
+        ErrorMessageFactory messageFactory = implementationRegistry.getErrorMessageFactory();
+
+        log.debug("Type adapting arguments...");
+        for (int i = 0; i < command.getActualParameters().size(); i++) {
+            ParameterDefinition parameter = command.getActualParameters().get(i);
+
+            // if parameter is array don't parse
+            if (String[].class.isAssignableFrom(parameter.type())) {
+                log.debug("First parameter is String array. Not adapting arguments");
+                arguments.add(input);
+                break;
+            }
+
+            String raw;
+            // current parameter index == total amount of input, check if it's optional else cancel context
+            if (i >= input.length) {
+                if (!parameter.isOptional()) {
+                    throw new IllegalStateException(
+                            "Command input doesn't match parameter length! Please report this error the the devs of jda-commands."
+                    );
+                }
+
+                // if the default value is an empty String (thus not present) add a null value to the argument list
+                // else try to type adapt the default value
+                if (parameter.defaultValue() == null) {
+                    arguments.add(TypeAdapterRegistry.DEFAULT_MAPPINGS.getOrDefault(parameter.type(), null));
+                    continue;
+                } else {
+                    raw = parameter.defaultValue();
+                }
+            } else {
+                raw = input[i];
+            }
+
+            log.debug("Trying to adapt input \"{}\" to type {}", raw, parameter.type().getName());
+
+            TypeAdapter<?> adapter = adapterRegistry.get(parameter.type()).orElseThrow(() ->
+                    new IllegalArgumentException(
+                            "No type adapter implementation found for %s. Consider implementing one or change the required type"
+                                    .formatted(parameter.type())
+                    )
+            );
+
+            Optional<?> parsed = adapter.apply(raw, event);
+            if (parsed.isEmpty()) {
+                log.debug("Type adapting failed!");
+                new MessageReply(event, command).reply(
+                        messageFactory.getTypeAdaptingFailedMessage(event, command, Arrays.asList(input))
+                );
+                return Optional.empty();
+            }
+
+            arguments.add(parsed.get());
+            log.debug("Added \"{}\" to the argument list", parsed.get());
+        }
+        return Optional.of(arguments);
+    }
+}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/command/package-info.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/command/package-info.java
new file mode 100644
index 000000000..1174dfb75
--- /dev/null
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/command/package-info.java
@@ -0,0 +1 @@
+package com.github.kaktushose.jda.commands.dispatching.handling.command;
\ No newline at end of file
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/package-info.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/package-info.java
new file mode 100644
index 000000000..b4f17e991
--- /dev/null
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/package-info.java
@@ -0,0 +1,4 @@
+@ApiStatus.Internal
+package com.github.kaktushose.jda.commands.dispatching.handling;
+
+import org.jetbrains.annotations.ApiStatus;
\ No newline at end of file
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/Context.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/Context.java
deleted file mode 100644
index 1959eac86..000000000
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/Context.java
+++ /dev/null
@@ -1,189 +0,0 @@
-package com.github.kaktushose.jda.commands.dispatching.interactions;
-
-import com.github.kaktushose.jda.commands.dispatching.KeyValueStore;
-import com.github.kaktushose.jda.commands.dispatching.RuntimeSupervisor.InteractionRuntime;
-import com.github.kaktushose.jda.commands.reflect.ImplementationRegistry;
-import com.github.kaktushose.jda.commands.reflect.InteractionRegistry;
-import com.github.kaktushose.jda.commands.reflect.interactions.GenericInteractionDefinition;
-import net.dv8tion.jda.api.entities.Message;
-import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent;
-import net.dv8tion.jda.api.utils.messages.MessageCreateData;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-/**
- * This class models an interaction execution. It gets constructed at the beginning of dispatching and gets passed
- * through the execution chain.
- *
- * @see GenericEvent
- * @see com.github.kaktushose.jda.commands.dispatching.interactions.commands.SlashCommandContext SlashCommandContext
- * @since 2.0.0
- */
-public class Context {
-
-    protected final GenericInteractionCreateEvent event;
-    protected MessageCreateData errorMessage;
-    protected ImplementationRegistry registry;
-    protected boolean cancelled;
-    protected boolean ephemeral;
-    protected InteractionRuntime runtime;
-    protected GenericInteractionDefinition interactionDefinition;
-    protected final InteractionRegistry interactionRegistry;
-    protected final ImplementationRegistry implementationRegistry;
-
-    /**
-     * Constructs a new GenericContext.
-     *
-     * @param event the corresponding {@link GenericInteractionCreateEvent}
-     */
-    public Context(GenericInteractionCreateEvent event, InteractionRegistry interactionRegistry, ImplementationRegistry implementationRegistry) {
-        this.event = event;
-        this.interactionRegistry = interactionRegistry;
-        this.implementationRegistry = implementationRegistry;
-    }
-
-    public GenericInteractionCreateEvent getEvent() {
-        return event;
-    }
-
-    /**
-     * Gets the {@link Message} to send if an error occurred.
-     *
-     * @return {@link Message} to send
-     */
-    @Nullable
-    public MessageCreateData getErrorMessage() {
-        return errorMessage;
-    }
-
-    /**
-     * Set the {@link ImplementationRegistry} instance.
-     *
-     * @param registry the {@link ImplementationRegistry} instance
-     * @return the current CommandContext instance
-     */
-    @NotNull
-    public Context setImplementationRegistry(@NotNull ImplementationRegistry registry) {
-        this.registry = registry;
-        return this;
-    }
-
-    /**
-     * Whether the context should be cancelled.
-     *
-     * @return {@code true} if the context should be cancelled
-     */
-    public boolean isCancelled() {
-        return cancelled;
-    }
-
-    /**
-     * Sets this context as cancelled and uses the provided {@link MessageCreateData} as an error message.
-     *
-     * @param errorMessage the error message as {@link MessageCreateData}
-     * @return the current Context instance
-     */
-    public Context setCancelled(MessageCreateData errorMessage) {
-        this.cancelled = true;
-        this.errorMessage = errorMessage;
-        return this;
-    }
-
-    /**
-     * Undoes {@link #setCancelled(MessageCreateData)} and.
-     *
-     * @return the current Context instance
-     */
-    public Context setUncancelled() {
-        this.cancelled = false;
-        return this;
-    }
-
-    /**
-     * Whether this context should send ephemeral replies.
-     *
-     * @return {@code true} if this context should send ephemeral replies
-     */
-    public boolean isEphemeral() {
-        return ephemeral;
-    }
-
-
-    /**
-     * Sets whether this context should send ephemeral replies.
-     *
-     * @param ephemeral {@code true} if this context should send ephemeral replies
-     * @return the current Context instance
-     */
-    public Context setEphemeral(boolean ephemeral) {
-        this.ephemeral = ephemeral;
-        return this;
-    }
-
-    /**
-     * Gets the {@link InteractionRuntime} used to execute this command event.
-     *
-     * @return the {@link InteractionRuntime}
-     */
-    public InteractionRuntime getRuntime() {
-        return runtime;
-    }
-
-    /**
-     * Sets the {@link InteractionRuntime} that will be used to execute this command event.
-     *
-     * @return the current CommandContext instance
-     */
-    public Context setRuntime(InteractionRuntime runtime) {
-        this.runtime = runtime;
-        return this;
-    }
-
-    /**
-     * Gets the {@link GenericInteractionDefinition} this context got created from.
-     *
-     * @return the {@link GenericInteractionDefinition}
-     */
-    public GenericInteractionDefinition getInteractionDefinition() {
-        return interactionDefinition;
-    }
-
-    /**
-     * Sets the {@link GenericInteractionDefinition}
-     *
-     * @param interactionDefinition the {@link GenericInteractionDefinition} of this context
-     * @return the current Context instance
-     */
-    public Context setInteractionDefinition(GenericInteractionDefinition interactionDefinition) {
-        this.interactionDefinition = interactionDefinition;
-        return this;
-    }
-
-    /**
-     * Gets the {@link KeyValueStore} that is bound to this runtime.
-     *
-     * @return the {@link KeyValueStore} bound to this runtime
-     */
-    public KeyValueStore getKeyValueStore() {
-        return runtime.getKeyValueStore();
-    }
-
-    /**
-     * Sets the {@link KeyValueStore} that is bound to this runtime.
-     *
-     * @param keyValueStore the {@link KeyValueStore} bound to this runtime
-     * @return the current Context instance
-     */
-    public Context setKeyValueStore(KeyValueStore keyValueStore) {
-        runtime.setKeyValueStore(keyValueStore);
-        return this;
-    }
-
-    public ImplementationRegistry getImplementationRegistry() {
-        return implementationRegistry;
-    }
-
-    public InteractionRegistry getInteractionRegistry() {
-        return interactionRegistry;
-    }
-}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/GenericDispatcher.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/GenericDispatcher.java
deleted file mode 100644
index 26c05690d..000000000
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/GenericDispatcher.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package com.github.kaktushose.jda.commands.dispatching.interactions;
-
-import com.github.kaktushose.jda.commands.dispatching.RuntimeSupervisor;
-import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapterRegistry;
-import com.github.kaktushose.jda.commands.dispatching.middleware.Middleware;
-import com.github.kaktushose.jda.commands.dispatching.middleware.MiddlewareRegistry;
-import com.github.kaktushose.jda.commands.dispatching.middleware.Priority;
-import com.github.kaktushose.jda.commands.reflect.ImplementationRegistry;
-import com.github.kaktushose.jda.commands.reflect.InteractionRegistry;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Abstract base class for event dispatchers.
- *
- * @since 4.0.0
- */
-public abstract class GenericDispatcher {
-
-    private final static Logger log = LoggerFactory.getLogger(GenericDispatcher.class);
-
-    protected final MiddlewareRegistry middlewareRegistry;
-    protected final ImplementationRegistry implementationRegistry;
-    protected final InteractionRegistry interactionRegistry;
-    protected final TypeAdapterRegistry adapterRegistry;
-    protected final RuntimeSupervisor runtimeSupervisor;
-
-    /**
-     * Constructs a new GenericDispatcher.
-     */
-    public GenericDispatcher(MiddlewareRegistry middlewareRegistry,
-                             ImplementationRegistry implementationRegistry,
-                             InteractionRegistry interactionRegistry,
-                             TypeAdapterRegistry adapterRegistry,
-                             RuntimeSupervisor runtimeSupervisor) {
-        this.middlewareRegistry = middlewareRegistry;
-        this.implementationRegistry = implementationRegistry;
-        this.interactionRegistry = interactionRegistry;
-        this.adapterRegistry = adapterRegistry;
-        this.runtimeSupervisor = runtimeSupervisor;
-    }
-
-    protected void executeMiddlewares(Context context) {
-        log.debug("Executing middlewares...");
-
-        for (Middleware middleware : middlewareRegistry.getMiddlewares(Priority.PERMISSIONS)) {
-            if (executeMiddleware(context, middleware)) return;
-        }
-        for (Middleware middleware : middlewareRegistry.getMiddlewares(Priority.HIGH)) {
-            if (executeMiddleware(context, middleware)) return;
-        }
-        for (Middleware middleware : middlewareRegistry.getMiddlewares(Priority.NORMAL)) {
-            if (executeMiddleware(context, middleware)) return;
-        }
-        for (Middleware middleware : middlewareRegistry.getMiddlewares(Priority.LOW)) {
-            if (executeMiddleware(context, middleware)) return;
-        }
-    }
-
-    private boolean executeMiddleware(Context context, Middleware middleware) {
-        log.debug("Executing middleware {}", middleware.getClass().getSimpleName());
-        middleware.accept(context);
-        return context.isCancelled();
-    }
-
-    /**
-     * Dispatches a {@link Context}.
-     *
-     * @param context the {@link Context} to dispatch.
-     */
-    public abstract void onEvent(Context context);
-
-}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/GenericEvent.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/GenericEvent.java
deleted file mode 100644
index 40236932e..000000000
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/GenericEvent.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package com.github.kaktushose.jda.commands.dispatching.interactions;
-
-import com.github.kaktushose.jda.commands.reflect.InteractionRegistry;
-import com.github.kaktushose.jda.commands.reflect.interactions.components.ButtonDefinition;
-import com.github.kaktushose.jda.commands.reflect.interactions.components.menus.GenericSelectMenuDefinition;
-import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent;
-import net.dv8tion.jda.api.interactions.components.buttons.Button;
-import net.dv8tion.jda.api.interactions.components.selections.SelectMenu;
-
-/**
- * Extension of JDAs {@link GenericInteractionCreateEvent} class. This is the base class for the different event classes.
- *
- * @see com.github.kaktushose.jda.commands.dispatching.interactions.commands.CommandEvent CommandEvent
- * @see com.github.kaktushose.jda.commands.dispatching.interactions.components.ComponentEvent ComponentEvent
- * @see com.github.kaktushose.jda.commands.dispatching.interactions.autocomplete.AutoCompleteEvent AutoCompleteEvent
- * @see com.github.kaktushose.jda.commands.dispatching.interactions.modals.ModalEvent ModalEvent
- * @since 4.0.0
- */
-public abstract class GenericEvent extends GenericInteractionCreateEvent {
-
-    protected final Context context;
-    private final InteractionRegistry interactionRegistry;
-
-    /**
-     * Constructs a new GenericEvent.
-     *
-     * @param context the underlying {@link Context}
-     */
-    protected GenericEvent(Context context, InteractionRegistry interactionRegistry) {
-        super(context.getEvent().getJDA(), context.getEvent().getResponseNumber(), context.getEvent().getInteraction());
-        this.context = context;
-        this.interactionRegistry = interactionRegistry;
-    }
-
-    /**
-     * Get the {@link Context} object.
-     *
-     * @return the registered {@link Context} object
-     */
-    public Context getContext() {
-        return context;
-    }
-
-    /**
-     * Gets a JDA {@link Button} to use it for message builders based on the jda-commands id. The returned button will
-     * be linked to the runtime of this event.
-     *
-     * <p>
-     * The id is made up of the simple class name and the method name. E.g. the id of a button defined by a
-     * {@code onButton(ComponentEvent event)} method inside an {@code ExampleButton} class would be
-     * {@code ExampleButton.onButton}.
-     * </p>
-     *
-     * @param button the id of the button
-     * @return a JDA {@link Button}
-     */
-    public Button getButton(String button) {
-        if (!button.matches("[a-zA-Z]+\\.[a-zA-Z]+")) {
-            throw new IllegalArgumentException("Unknown Button");
-        }
-
-        String sanitizedId = button.replaceAll("\\.", "");
-        ButtonDefinition buttonDefinition = interactionRegistry.getButtons().stream()
-                .filter(it -> it.getDefinitionId().equals(sanitizedId))
-                .findFirst().orElseThrow(() -> new IllegalArgumentException("Unknown Button"));
-
-        return buttonDefinition.toButton().withId(buttonDefinition.createCustomId(context.getRuntime().getRuntimeId()));
-    }
-
-    /**
-     * Gets a JDA {@link SelectMenu} to use it for message builders based on the jda-commands id. The returned
-     * SelectMenu will be linked to the runtime of this event.
-     *
-     * <p>
-     * The id is made up of the simple class name and the method name. E.g. the id of a select menu defined by a
-     * {@code onSelectMenu(ComponentEvent event)} method inside an {@code ExampleMenu} class would be
-     * {@code ExampleMenu.onSelectMenu}.
-     * </p>
-     *
-     * @param menu the id of the selectMenu
-     * @return a JDA {@link SelectMenu}
-     */
-    @SuppressWarnings("unchecked")
-    public <T extends SelectMenu> T getSelectMenu(String menu) {
-        if (!menu.matches("[a-zA-Z]+\\.[a-zA-Z]+")) {
-            throw new IllegalArgumentException("Unknown Select Menu");
-        }
-
-        String sanitizedId = menu.replaceAll("\\.", "");
-        GenericSelectMenuDefinition<?> selectMenuDefinition = interactionRegistry.getSelectMenus().stream()
-                .filter(it -> it.getDefinitionId().equals(sanitizedId))
-                .findFirst().orElseThrow(() -> new IllegalArgumentException("Unknown Select Menu"));
-
-        return (T) selectMenuDefinition.toSelectMenu(context.getRuntime().getRuntimeId(), true);
-    }
-}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/autocomplete/AutoCompleteDispatcher.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/autocomplete/AutoCompleteDispatcher.java
deleted file mode 100644
index 34ef20298..000000000
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/autocomplete/AutoCompleteDispatcher.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package com.github.kaktushose.jda.commands.dispatching.interactions.autocomplete;
-
-import com.github.kaktushose.jda.commands.dispatching.RuntimeSupervisor;
-import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapterRegistry;
-import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
-import com.github.kaktushose.jda.commands.dispatching.interactions.GenericDispatcher;
-import com.github.kaktushose.jda.commands.dispatching.middleware.MiddlewareRegistry;
-import com.github.kaktushose.jda.commands.dispatching.reply.ReplyContext;
-import com.github.kaktushose.jda.commands.reflect.ImplementationRegistry;
-import com.github.kaktushose.jda.commands.reflect.InteractionRegistry;
-import com.github.kaktushose.jda.commands.reflect.interactions.AutoCompleteDefinition;
-import net.dv8tion.jda.api.events.interaction.command.CommandAutoCompleteInteractionEvent;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.Optional;
-
-/**
- * Dispatches auto complete by taking a {@link Context} and passing it through the execution chain.
- *
- * @since 4.0.0
- */
-public class AutoCompleteDispatcher extends GenericDispatcher {
-
-    private static final Logger log = LoggerFactory.getLogger(AutoCompleteDispatcher.class);
-
-    /**
-     * Constructs a new AutoCompleteDispatcher.
-     *
-     * @param middlewareRegistry
-     * @param implementationRegistry
-     * @param interactionRegistry
-     * @param adapterRegistry
-     * @param runtimeSupervisor
-     */
-    public AutoCompleteDispatcher(MiddlewareRegistry middlewareRegistry, ImplementationRegistry implementationRegistry, InteractionRegistry interactionRegistry, TypeAdapterRegistry adapterRegistry, RuntimeSupervisor runtimeSupervisor) {
-        super(middlewareRegistry, implementationRegistry, interactionRegistry, adapterRegistry, runtimeSupervisor);
-    }
-
-    @Override
-    public void onEvent(Context context) {
-        CommandAutoCompleteInteractionEvent event = (CommandAutoCompleteInteractionEvent) context.getEvent();
-        Optional<AutoCompleteDefinition> optionalAutoComplete = interactionRegistry.getAutoCompletes().stream()
-                .filter(it -> it.getCommandNames().stream().anyMatch(name -> event.getFullCommandName().startsWith(name)))
-                .findFirst();
-
-        if (optionalAutoComplete.isEmpty()) {
-            log.debug("No auto complete handler found for {}", event.getFullCommandName());
-            return;
-        }
-
-        AutoCompleteDefinition autoComplete = optionalAutoComplete.get();
-        context.setInteractionDefinition(autoComplete);
-
-        executeMiddlewares(context);
-        if (checkCancelled(context)) {
-            log.debug("Interaction execution cancelled by middleware");
-            return;
-        }
-
-        log.debug("Input matches auto complete: {}", autoComplete.getDefinitionId());
-        log.info("Executing auto complete {} for user {}", autoComplete.getMethod().getName(), event.getMember());
-        try {
-            autoComplete.getMethod().invoke(runtimeSupervisor.newRuntime(autoComplete).getInstance(), new AutoCompleteEvent(context, interactionRegistry));
-        } catch (Exception exception) {
-            throw new IllegalStateException("Auto complete execution failed!", exception);
-        }
-    }
-
-    @SuppressWarnings("DataFlowIssue")
-    private boolean checkCancelled(Context context) {
-        if (context.isCancelled()) {
-            ReplyContext replyContext = new ReplyContext(context);
-            replyContext.getBuilder().applyData(context.getErrorMessage());
-            replyContext.queue();
-            return true;
-        }
-        return false;
-    }
-
-}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/commands/CommandDispatcher.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/commands/CommandDispatcher.java
deleted file mode 100644
index 8df5ef346..000000000
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/commands/CommandDispatcher.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.github.kaktushose.jda.commands.dispatching.interactions.commands;
-
-import com.github.kaktushose.jda.commands.dispatching.RuntimeSupervisor;
-import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapterRegistry;
-import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
-import com.github.kaktushose.jda.commands.dispatching.interactions.GenericDispatcher;
-import com.github.kaktushose.jda.commands.dispatching.middleware.MiddlewareRegistry;
-import com.github.kaktushose.jda.commands.dispatching.reply.ReplyContext;
-import com.github.kaktushose.jda.commands.embeds.ErrorMessageFactory;
-import com.github.kaktushose.jda.commands.reflect.ImplementationRegistry;
-import com.github.kaktushose.jda.commands.reflect.InteractionRegistry;
-import com.github.kaktushose.jda.commands.reflect.interactions.commands.GenericCommandDefinition;
-import com.github.kaktushose.jda.commands.reflect.interactions.commands.SlashCommandDefinition;
-import net.dv8tion.jda.api.events.interaction.command.GenericCommandInteractionEvent;
-import net.dv8tion.jda.api.events.interaction.command.GenericContextInteractionEvent;
-import net.dv8tion.jda.api.interactions.commands.Command;
-import net.dv8tion.jda.api.interactions.commands.OptionMapping;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-
-/**
- * Dispatches command events.
- *
- * @since 4.0.0
- */
-public class CommandDispatcher extends GenericDispatcher {
-
-    private static final Logger log = LoggerFactory.getLogger(CommandDispatcher.class);
-
-    /**
-     * Constructs a new CommandDispatcher.
-     *
-     * @param middlewareRegistry
-     * @param implementationRegistry
-     * @param interactionRegistry
-     * @param adapterRegistry
-     * @param runtimeSupervisor
-     */
-    public CommandDispatcher(MiddlewareRegistry middlewareRegistry, ImplementationRegistry implementationRegistry, InteractionRegistry interactionRegistry, TypeAdapterRegistry adapterRegistry, RuntimeSupervisor runtimeSupervisor) {
-        super(middlewareRegistry, implementationRegistry, interactionRegistry, adapterRegistry, runtimeSupervisor);
-    }
-
-    @Override
-    public void onEvent(Context context) {
-        GenericCommandInteractionEvent event = (GenericCommandInteractionEvent) context.getEvent();
-        ErrorMessageFactory messageFactory = implementationRegistry.getErrorMessageFactory();
-
-        Optional<GenericCommandDefinition> optional = interactionRegistry.getCommands().stream()
-                .filter(it -> it.getName().equals(event.getFullCommandName()))
-                .findFirst();
-
-        if (optional.isEmpty()) {
-            IllegalStateException exception = new IllegalStateException("No command found! Please report this error the the devs of jda-commands.");
-            context.setCancelled(messageFactory.getCommandExecutionFailedMessage(context, exception));
-            checkCancelled(context);
-            throw exception;
-        }
-
-        GenericCommandDefinition command = optional.get();
-        context.setInteractionDefinition(command).setEphemeral(command.isEphemeral());
-        log.debug("Input matches command: {}", command.getDefinitionId());
-
-        List<Object> arguments;
-        if (command.getCommandType() == Command.Type.SLASH) {
-            SlashCommandDefinition slashCommand = (SlashCommandDefinition) command;
-            SlashCommandContext slashContext = (SlashCommandContext) context;
-            slashContext.setCommand(slashCommand);
-
-            Map<String, OptionMapping> options = slashContext.getOptionsAsMap();
-            List<String> parameters = new ArrayList<>();
-            slashCommand.getActualParameters().forEach(param -> {
-                if (!options.containsKey(param.name())) {
-                    return;
-                }
-                parameters.add(options.get(param.name()).getAsString());
-            });
-            slashContext.setInput(parameters.toArray(new String[]{}));
-
-            adapterRegistry.adapt(slashContext);
-            if (checkCancelled(slashContext)) {
-                return;
-            }
-
-            arguments = slashContext.getArguments();
-            arguments.addFirst(new CommandEvent(context, interactionRegistry));
-        } else {
-            arguments = List.of(
-                    new CommandEvent(context, interactionRegistry),
-                    ((GenericContextInteractionEvent<?>) event).getTarget()
-            );
-        }
-
-        executeMiddlewares(context);
-        if (checkCancelled(context)) {
-            log.debug("Interaction execution cancelled by middleware");
-            return;
-        }
-
-        log.info("Executing command {} for user {}", command.getMethod().getName(), context.getEvent().getMember());
-        try {
-            RuntimeSupervisor.InteractionRuntime runtime = runtimeSupervisor.newRuntime(event, command);
-            context.setRuntime(runtime);
-            log.debug("Invoking method with following arguments: {}", arguments);
-            command.getMethod().invoke(runtime.getInstance(), arguments.toArray());
-        } catch (Exception exception) {
-            log.error("Command execution failed!", exception);
-            // this unwraps the underlying error in case of an exception inside the command class
-            Throwable throwable = exception instanceof InvocationTargetException ? exception.getCause() : exception;
-            context.setCancelled(messageFactory.getCommandExecutionFailedMessage(context, throwable));
-            checkCancelled(context);
-        }
-    }
-
-    @SuppressWarnings("DataFlowIssue")
-    private boolean checkCancelled(Context context) {
-        if (context.isCancelled()) {
-            ReplyContext replyContext = new ReplyContext(context);
-            replyContext.getBuilder().applyData(context.getErrorMessage());
-            replyContext.queue();
-            return true;
-        }
-        return false;
-    }
-}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/commands/CommandEvent.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/commands/CommandEvent.java
deleted file mode 100644
index 80537979a..000000000
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/commands/CommandEvent.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.github.kaktushose.jda.commands.dispatching.interactions.commands;
-
-import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
-import com.github.kaktushose.jda.commands.dispatching.interactions.GenericEvent;
-import com.github.kaktushose.jda.commands.dispatching.reply.ModalReplyable;
-import com.github.kaktushose.jda.commands.dispatching.reply.ReplyContext;
-import com.github.kaktushose.jda.commands.reflect.InteractionRegistry;
-import org.jetbrains.annotations.NotNull;
-
-/**
- * This class is a subclass of {@link GenericEvent}.
- * It provides additional features for replying to a
- * {@link net.dv8tion.jda.api.events.interaction.command.GenericCommandInteractionEvent GenericCommandInteractionEvent}.
- *
- * @see GenericEvent
- * @since 4.0.0
- */
-public class CommandEvent extends GenericEvent implements ModalReplyable {
-
-    private final ReplyContext replyContext;
-
-    /**
-     * Constructs a new CommandEvent.
-     *
-     * @param context the underlying {@link Context}
-     */
-    public CommandEvent(@NotNull Context context, InteractionRegistry interactionRegistry) {
-        super(context, interactionRegistry);
-        replyContext = new ReplyContext(context);
-    }
-
-    @Override
-    public @NotNull ReplyContext getReplyContext() {
-        return replyContext;
-    }
-
-    @Override
-    public void reply() {
-        replyContext.queue();
-        context.getRuntime().setLatestReply(replyContext.toMessageCreateData());
-    }
-}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/commands/SlashCommandContext.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/commands/SlashCommandContext.java
deleted file mode 100644
index 68bfa9c87..000000000
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/commands/SlashCommandContext.java
+++ /dev/null
@@ -1,146 +0,0 @@
-package com.github.kaktushose.jda.commands.dispatching.interactions.commands;
-
-import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
-import com.github.kaktushose.jda.commands.reflect.ImplementationRegistry;
-import com.github.kaktushose.jda.commands.reflect.InteractionRegistry;
-import com.github.kaktushose.jda.commands.reflect.interactions.commands.SlashCommandDefinition;
-import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
-import net.dv8tion.jda.api.interactions.commands.OptionMapping;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Implementation of {@link Context} for {@link SlashCommandInteractionEvent}.
- *
- * @since 4.0.0
- */
-public class SlashCommandContext extends Context {
-
-    private String[] input;
-    private List<OptionMapping> options;
-    private SlashCommandDefinition command;
-    private List<Object> arguments;
-
-    /**
-     * Constructs a new CommandContext.
-     *
-     * @param event the corresponding {@link SlashCommandInteractionEvent}
-     */
-    public SlashCommandContext(SlashCommandInteractionEvent event, InteractionRegistry interactionRegistry, ImplementationRegistry implementationRegistry) {
-        super(event, interactionRegistry, implementationRegistry);
-        setOptions(event.getOptions());
-    }
-
-    @Override
-    public SlashCommandInteractionEvent getEvent() {
-        return (SlashCommandInteractionEvent) super.getEvent();
-    }
-
-    /**
-     * Gets the raw user input.
-     *
-     * @return the raw user input
-     * @see #getOptions()
-     */
-    @NotNull
-    public String[] getInput() {
-        return input;
-    }
-
-    /**
-     * Set the user input.
-     *
-     * @param input the user input
-     * @return the current CommandContext instance
-     */
-    @NotNull
-    public SlashCommandContext setInput(@NotNull String[] input) {
-        this.input = input;
-        return this;
-    }
-
-    /**
-     * Gets the {@link OptionMapping OptionMappings}.
-     *
-     * @return the {@link OptionMapping OptionMappings}
-     * @see #getInput()
-     */
-    @NotNull
-    public List<OptionMapping> getOptions() {
-        return options;
-    }
-
-    /**
-     * Set the {@link OptionMapping OptionMappings}.
-     *
-     * @param options the {@link OptionMapping OptionMappings}
-     * @return the current CommandContext instance
-     */
-    @NotNull
-    public SlashCommandContext setOptions(@NotNull List<OptionMapping> options) {
-        this.options = options;
-        return this;
-    }
-
-    /**
-     * Gets the {@link OptionMapping OptionMappings} inserted in a {@code Map<Name, Mapping>}.
-     *
-     * @return the {@link OptionMapping OptionMappings}
-     * @see #getInput()
-     */
-    @NotNull
-    public Map<String, OptionMapping> getOptionsAsMap() {
-        Map<String, OptionMapping> result = new HashMap<>();
-        options.forEach(option -> result.put(option.getName(), option));
-        return result;
-    }
-
-    /**
-     * Gets the {@link SlashCommandDefinition}. This will return null until the command got routed.
-     *
-     * @return the {@link SlashCommandDefinition}
-     */
-    @Nullable
-    public SlashCommandDefinition getCommand() {
-        return command;
-    }
-
-    /**
-     * Set the {@link SlashCommandDefinition}.
-     *
-     * @param command the {@link SlashCommandDefinition}
-     * @return the current CommandContext instance
-     */
-    @NotNull
-    public SlashCommandContext setCommand(@Nullable SlashCommandDefinition command) {
-        this.command = command;
-        setInteractionDefinition(command);
-        return this;
-    }
-
-    /**
-     * Gets the parsed arguments.
-     *
-     * @return the parsed arguments
-     */
-    @NotNull
-    public List<Object> getArguments() {
-        return arguments;
-    }
-
-    /**
-     * Set the arguments.
-     *
-     * @param arguments the parsed arguments
-     * @return the current CommandContext instance
-     */
-    @NotNull
-    public SlashCommandContext setArguments(@NotNull List<Object> arguments) {
-        this.arguments = arguments;
-        return this;
-    }
-}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/components/ComponentDispatcher.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/components/ComponentDispatcher.java
deleted file mode 100644
index c6f14199f..000000000
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/components/ComponentDispatcher.java
+++ /dev/null
@@ -1,128 +0,0 @@
-package com.github.kaktushose.jda.commands.dispatching.interactions.components;
-
-import com.github.kaktushose.jda.commands.dispatching.RuntimeSupervisor;
-import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapterRegistry;
-import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
-import com.github.kaktushose.jda.commands.dispatching.interactions.GenericDispatcher;
-import com.github.kaktushose.jda.commands.dispatching.middleware.MiddlewareRegistry;
-import com.github.kaktushose.jda.commands.dispatching.reply.ReplyContext;
-import com.github.kaktushose.jda.commands.embeds.ErrorMessageFactory;
-import com.github.kaktushose.jda.commands.reflect.ImplementationRegistry;
-import com.github.kaktushose.jda.commands.reflect.InteractionRegistry;
-import com.github.kaktushose.jda.commands.reflect.interactions.CustomId;
-import com.github.kaktushose.jda.commands.reflect.interactions.EphemeralInteractionDefinition;
-import com.github.kaktushose.jda.commands.reflect.interactions.components.ButtonDefinition;
-import com.github.kaktushose.jda.commands.reflect.interactions.components.menus.EntitySelectMenuDefinition;
-import com.github.kaktushose.jda.commands.reflect.interactions.components.menus.StringSelectMenuDefinition;
-import net.dv8tion.jda.api.events.interaction.component.EntitySelectInteractionEvent;
-import net.dv8tion.jda.api.events.interaction.component.GenericComponentInteractionCreateEvent;
-import net.dv8tion.jda.api.events.interaction.component.StringSelectInteractionEvent;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-
-/**
- * Dispatches component events.
- *
- * @since 4.0.0
- */
-public class ComponentDispatcher extends GenericDispatcher {
-
-    private static final Logger log = LoggerFactory.getLogger(ComponentDispatcher.class);
-
-    /**
-     * Constructs a new ComponentDispatcher.
-     *
-     * @param middlewareRegistry
-     * @param implementationRegistry
-     * @param interactionRegistry
-     * @param adapterRegistry
-     * @param runtimeSupervisor
-     */
-    public ComponentDispatcher(MiddlewareRegistry middlewareRegistry, ImplementationRegistry implementationRegistry, InteractionRegistry interactionRegistry, TypeAdapterRegistry adapterRegistry, RuntimeSupervisor runtimeSupervisor) {
-        super(middlewareRegistry, implementationRegistry, interactionRegistry, adapterRegistry, runtimeSupervisor);
-    }
-
-    @Override
-    public void onEvent(Context context) {
-        GenericComponentInteractionCreateEvent event = (GenericComponentInteractionCreateEvent) context.getEvent();
-        if (!event.getComponentId().matches(CustomId.CUSTOM_ID_REGEX)) {
-            log.debug("Ignoring non jda-commands event {}", event.getComponentId());
-            return;
-        }
-
-        ErrorMessageFactory messageFactory = implementationRegistry.getErrorMessageFactory();
-
-        Optional<RuntimeSupervisor.InteractionRuntime> optionalRuntime = runtimeSupervisor.getRuntime(event);
-        if (optionalRuntime.isEmpty()) {
-            event.deferEdit().setComponents().queue();
-            event.getHook().sendMessage(messageFactory.getUnknownInteractionMessage(context)).setEphemeral(true).queue();
-            return;
-        }
-        RuntimeSupervisor.InteractionRuntime runtime = optionalRuntime.get();
-        log.debug("Found corresponding runtime with id \"{}\"", runtime.getRuntimeId());
-
-        String componentId = event.getComponentId().split("\\.")[1];
-
-        List<EphemeralInteractionDefinition> components = new ArrayList<>();
-        components.addAll(interactionRegistry.getButtons());
-        components.addAll(interactionRegistry.getSelectMenus());
-
-        Optional<EphemeralInteractionDefinition> optionalComponent = components.stream().filter(it -> it.getDefinitionId().equals(componentId)).findFirst();
-        if (optionalComponent.isEmpty()) {
-            IllegalStateException exception = new IllegalStateException(
-                    "No component found! Please report this error the the devs of jda-commands."
-            );
-            context.setCancelled(messageFactory.getCommandExecutionFailedMessage(context, exception));
-            checkCancelled(context);
-            throw exception;
-        }
-
-        EphemeralInteractionDefinition component = optionalComponent.get();
-        context.setInteractionDefinition(component).setEphemeral(component.isEphemeral());
-
-        executeMiddlewares(context);
-        if (checkCancelled(context)) {
-            log.debug("Interaction execution cancelled by middleware");
-            return;
-        }
-
-        log.debug("Input matches component: {}", component.getDefinitionId());
-        log.info("Executing component {} for user {}", component.getMethod().getName(), event.getMember());
-        context.setRuntime(runtime);
-        try {
-            Class<?> clazz = component.getClass();
-            if (EntitySelectMenuDefinition.class.isAssignableFrom(clazz)) {
-                component.getMethod().invoke(runtime.getInstance(), new ComponentEvent(context, interactionRegistry), ((EntitySelectInteractionEvent) event).getMentions());
-            } else if (StringSelectMenuDefinition.class.isAssignableFrom(clazz)) {
-                component.getMethod().invoke(runtime.getInstance(), new ComponentEvent(context, interactionRegistry), ((StringSelectInteractionEvent) event).getValues());
-            } else if (ButtonDefinition.class.isAssignableFrom(clazz)) {
-                component.getMethod().invoke(runtime.getInstance(), new ComponentEvent(context, interactionRegistry));
-            } else {
-                throw new IllegalStateException("Unknown component type! Please report this error the the devs of jda-commands.");
-            }
-        } catch (Exception exception) {
-            log.error("Select menu execution failed!", exception);
-            // this unwraps the underlying error in case of an exception inside the command class
-            Throwable throwable = exception instanceof InvocationTargetException ? exception.getCause() : exception;
-
-            context.setCancelled(messageFactory.getCommandExecutionFailedMessage(context, throwable));
-            checkCancelled(context);
-        }
-    }
-
-    @SuppressWarnings("DataFlowIssue")
-    private boolean checkCancelled(Context context) {
-        if (context.isCancelled()) {
-            ReplyContext replyContext = new ReplyContext(context);
-            replyContext.getBuilder().applyData(context.getErrorMessage());
-            replyContext.queue();
-            return true;
-        }
-        return false;
-    }
-}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/components/ComponentEvent.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/components/ComponentEvent.java
deleted file mode 100644
index 3b742398e..000000000
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/components/ComponentEvent.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.github.kaktushose.jda.commands.dispatching.interactions.components;
-
-import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
-import com.github.kaktushose.jda.commands.dispatching.interactions.GenericEvent;
-import com.github.kaktushose.jda.commands.dispatching.reply.ModalReplyable;
-import com.github.kaktushose.jda.commands.dispatching.reply.ReplyContext;
-import com.github.kaktushose.jda.commands.reflect.InteractionRegistry;
-import net.dv8tion.jda.api.utils.messages.MessageCreateData;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.Optional;
-
-/**
- * This class is a subclass of {@link GenericEvent}.
- * It provides additional features for replying to a
- * {@link net.dv8tion.jda.api.events.interaction.component.GenericComponentInteractionCreateEvent GenericComponentInteractionCreateEvent}.
- *
- * @see GenericEvent
- * @since 4.0.0
- */
-public class ComponentEvent extends GenericEvent implements ModalReplyable {
-
-    private final ReplyContext replyContext;
-
-    /**
-     * Constructs a ComponentEvent.
-     *
-     * @param context the underlying {@link Context}
-     */
-    public ComponentEvent(@NotNull Context context, InteractionRegistry interactionRegistry) {
-        super(context, interactionRegistry);
-        replyContext = new ReplyContext(context);
-    }
-
-    @NotNull
-    public ReplyContext getReplyContext() {
-        return replyContext;
-    }
-
-    @Override
-    public void reply() {
-        Optional<MessageCreateData> optional = context.getRuntime().getLatestReply();
-        if (optional.isPresent()) {
-            MessageCreateData cached = optional.get();
-            if (replyContext.isKeepComponents() && replyContext.getBuilder().getComponents().isEmpty()) {
-                replyContext.getBuilder().setComponents(cached.getComponents());
-            }
-
-        }
-        replyContext.queue();
-        context.getRuntime().setLatestReply(replyContext.toMessageCreateData());
-    }
-}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/modals/ModalDispatcher.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/modals/ModalDispatcher.java
deleted file mode 100644
index 533159f74..000000000
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/modals/ModalDispatcher.java
+++ /dev/null
@@ -1,115 +0,0 @@
-package com.github.kaktushose.jda.commands.dispatching.interactions.modals;
-
-import com.github.kaktushose.jda.commands.dispatching.RuntimeSupervisor;
-import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapterRegistry;
-import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
-import com.github.kaktushose.jda.commands.dispatching.interactions.GenericDispatcher;
-import com.github.kaktushose.jda.commands.dispatching.middleware.MiddlewareRegistry;
-import com.github.kaktushose.jda.commands.dispatching.reply.ReplyContext;
-import com.github.kaktushose.jda.commands.embeds.ErrorMessageFactory;
-import com.github.kaktushose.jda.commands.reflect.ImplementationRegistry;
-import com.github.kaktushose.jda.commands.reflect.InteractionRegistry;
-import com.github.kaktushose.jda.commands.reflect.interactions.CustomId;
-import com.github.kaktushose.jda.commands.reflect.interactions.ModalDefinition;
-import net.dv8tion.jda.api.events.interaction.ModalInteractionEvent;
-import net.dv8tion.jda.api.interactions.modals.ModalMapping;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
-/**
- * Dispatches {@link ModalInteractionEvent ModalInteractionEvents}.
- *
- * @since 4.0.0
- */
-public class ModalDispatcher extends GenericDispatcher {
-
-    private static final Logger log = LoggerFactory.getLogger(ModalDispatcher.class);
-
-    /**
-     * Constructs a new ModalDispatcher.
-     *
-     * @param middlewareRegistry
-     * @param implementationRegistry
-     * @param interactionRegistry
-     * @param adapterRegistry
-     * @param runtimeSupervisor
-     */
-    public ModalDispatcher(MiddlewareRegistry middlewareRegistry, ImplementationRegistry implementationRegistry, InteractionRegistry interactionRegistry, TypeAdapterRegistry adapterRegistry, RuntimeSupervisor runtimeSupervisor) {
-        super(middlewareRegistry, implementationRegistry, interactionRegistry, adapterRegistry, runtimeSupervisor);
-    }
-
-    @Override
-    public void onEvent(Context context) {
-        ModalInteractionEvent event = (ModalInteractionEvent) context.getEvent();
-        if (!event.getModalId().matches(CustomId.CUSTOM_ID_REGEX)) {
-            log.debug("Ignoring non jda-commands event {}", event.getModalId());
-            return;
-        }
-
-        ErrorMessageFactory messageFactory = implementationRegistry.getErrorMessageFactory();
-
-        Optional<RuntimeSupervisor.InteractionRuntime> optionalRuntime = runtimeSupervisor.getRuntime(event);
-        if (optionalRuntime.isEmpty()) {
-            event.reply(messageFactory.getUnknownInteractionMessage(context)).setEphemeral(true).queue();
-            return;
-        }
-        RuntimeSupervisor.InteractionRuntime runtime = optionalRuntime.get();
-        log.debug("Found corresponding runtime with id \"{}\"", runtime.getRuntimeId());
-
-        String modalId = event.getModalId().split("\\.")[1];
-        Optional<ModalDefinition> optionalModal = interactionRegistry.getModals().stream()
-                .filter(it -> it.getDefinitionId().equals(modalId))
-                .findFirst();
-
-        if (optionalModal.isEmpty()) {
-            IllegalStateException exception = new IllegalStateException(
-                    "No Modal found! Please report this error the the devs of jda-commands."
-            );
-            context.setCancelled(messageFactory.getCommandExecutionFailedMessage(context, exception));
-            checkCancelled(context);
-            throw exception;
-        }
-
-        ModalDefinition modal = optionalModal.get();
-        context.setInteractionDefinition(modal).setEphemeral(modal.isEphemeral());
-
-        executeMiddlewares(context);
-        if (checkCancelled(context)) {
-            log.debug("Interaction execution cancelled by middleware");
-            return;
-        }
-
-        log.debug("Input matches Modal: {}", modal.getDefinitionId());
-        log.info("Executing Modal {} for user {}", modal.getMethod().getName(), event.getMember());
-        try {
-            context.setRuntime(runtime);
-            List<Object> arguments = new ArrayList<>();
-            arguments.add(new ModalEvent(context, interactionRegistry));
-            arguments.addAll(event.getValues().stream().map(ModalMapping::getAsString).collect(Collectors.toList()));
-            modal.getMethod().invoke(runtime.getInstance(), arguments.toArray());
-        } catch (Exception exception) {
-            log.error("Modal execution failed!", exception);
-            // this unwraps the underlying error in case of an exception inside the command class
-            Throwable throwable = exception instanceof InvocationTargetException ? exception.getCause() : exception;
-            context.setCancelled(messageFactory.getCommandExecutionFailedMessage(context, throwable));
-            checkCancelled(context);
-        }
-    }
-
-    @SuppressWarnings("DataFlowIssue")
-    private boolean checkCancelled(Context context) {
-        if (context.isCancelled()) {
-            ReplyContext replyContext = new ReplyContext(context);
-            replyContext.getBuilder().applyData(context.getErrorMessage());
-            replyContext.setEditReply(false).queue();
-            return true;
-        }
-        return false;
-    }
-}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/modals/ModalEvent.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/modals/ModalEvent.java
deleted file mode 100644
index 077007b3d..000000000
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/interactions/modals/ModalEvent.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.github.kaktushose.jda.commands.dispatching.interactions.modals;
-
-import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
-import com.github.kaktushose.jda.commands.dispatching.interactions.GenericEvent;
-import com.github.kaktushose.jda.commands.dispatching.reply.ReplyContext;
-import com.github.kaktushose.jda.commands.dispatching.reply.Replyable;
-import com.github.kaktushose.jda.commands.reflect.InteractionRegistry;
-import org.jetbrains.annotations.NotNull;
-
-/**
- * This class is a subclass of {@link GenericEvent}.
- * It provides additional features for replying to a
- * {@link net.dv8tion.jda.api.events.interaction.ModalInteractionEvent ModalInteractionEvent}.
- *
- * @see GenericEvent
- * @since 4.0.0
- */
-public class ModalEvent extends GenericEvent implements Replyable {
-
-    private final ReplyContext replyContext;
-
-    protected ModalEvent(Context context, InteractionRegistry interactionRegistry) {
-        super(context, interactionRegistry);
-        replyContext = new ReplyContext(context);
-    }
-
-    @Override
-    public @NotNull ReplyContext getReplyContext() {
-        return replyContext;
-    }
-
-    @Override
-    public void reply() {
-        replyContext.queue();
-    }
-}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/internal/JDAEventListener.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/internal/JDAEventListener.java
new file mode 100644
index 000000000..33c62f51b
--- /dev/null
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/internal/JDAEventListener.java
@@ -0,0 +1,76 @@
+package com.github.kaktushose.jda.commands.dispatching.internal;
+
+import com.github.kaktushose.jda.commands.dispatching.handling.DispatchingContext;
+import com.github.kaktushose.jda.commands.reflect.interactions.CustomId;
+import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent;
+import net.dv8tion.jda.api.events.interaction.ModalInteractionEvent;
+import net.dv8tion.jda.api.events.interaction.command.CommandAutoCompleteInteractionEvent;
+import net.dv8tion.jda.api.events.interaction.command.GenericContextInteractionEvent;
+import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
+import net.dv8tion.jda.api.events.interaction.component.GenericComponentInteractionCreateEvent;
+import net.dv8tion.jda.api.hooks.ListenerAdapter;
+import org.jetbrains.annotations.NotNull;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+
+/// Handles incoming [GenericInteractionCreateEvent]s and maps them to their corresponding [Runtime], creating new ones if needed.
+public final class JDAEventListener extends ListenerAdapter {
+
+    private static final Logger log = LoggerFactory.getLogger(JDAEventListener.class);
+    private final Map<String, Runtime> runtimes = new ConcurrentHashMap<>();
+    private final DispatchingContext context;
+
+    public JDAEventListener(DispatchingContext context) {
+        this.context = context;
+    }
+
+    @Override
+    public void onGenericInteractionCreate(@NotNull GenericInteractionCreateEvent jdaEvent) {
+        checkRuntimesAlive();
+
+        Runtime runtime = switch (jdaEvent) {
+            // always create new one (starter)
+            case SlashCommandInteractionEvent _, GenericContextInteractionEvent<?> _,
+                 CommandAutoCompleteInteractionEvent _ ->
+                    runtimes.compute(UUID.randomUUID().toString(), (id, _) -> Runtime.startNew(id, context));
+
+            // always fetch runtime (bound to runtime)
+            case GenericComponentInteractionCreateEvent event when CustomId.isBound(event.getComponentId()) ->
+                    runtimes.get(CustomId.runtimeId(event.getComponentId()));
+            case ModalInteractionEvent event when CustomId.isBound(event.getModalId()) ->
+                    runtimes.get(CustomId.runtimeId(event.getModalId()));
+
+            // independent components always get their own runtime
+            case GenericComponentInteractionCreateEvent event when CustomId.isIndependent(event.getComponentId()) ->
+                    runtimes.compute(UUID.randomUUID().toString(), (id, _) -> Runtime.startNew(id, context));
+            default -> null;
+        };
+
+        if (runtime == null) {
+            if (jdaEvent instanceof GenericComponentInteractionCreateEvent componentEvent && !CustomId.isInvalid(componentEvent.getComponentId())) {
+                componentEvent.deferEdit().setComponents().queue();
+                componentEvent.getHook()
+                        .setEphemeral(true)
+                        .sendMessage(context.implementationRegistry().getErrorMessageFactory().getTimedOutComponentMessage())
+                        .queue();
+            } else {
+                log.debug("Received unknown event: {}", jdaEvent);
+            }
+            return;
+        }
+
+        log.debug("Found runtime with id {} for event {}", runtime.id(), jdaEvent);
+
+        runtime.queueEvent(jdaEvent);
+    }
+
+    private void checkRuntimesAlive() {
+        runtimes.values().removeIf(Runtime::isClosed);
+    }
+
+
+}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/internal/Runtime.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/internal/Runtime.java
new file mode 100644
index 000000000..12082da78
--- /dev/null
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/internal/Runtime.java
@@ -0,0 +1,147 @@
+package com.github.kaktushose.jda.commands.dispatching.internal;
+
+import com.github.kaktushose.jda.commands.dispatching.ExpirationStrategy;
+import com.github.kaktushose.jda.commands.dispatching.context.KeyValueStore;
+import com.github.kaktushose.jda.commands.dispatching.handling.*;
+import com.github.kaktushose.jda.commands.dispatching.handling.command.ContextCommandHandler;
+import com.github.kaktushose.jda.commands.dispatching.handling.command.SlashCommandHandler;
+import com.github.kaktushose.jda.commands.reflect.interactions.GenericInteractionDefinition;
+import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent;
+import net.dv8tion.jda.api.events.interaction.ModalInteractionEvent;
+import net.dv8tion.jda.api.events.interaction.command.CommandAutoCompleteInteractionEvent;
+import net.dv8tion.jda.api.events.interaction.command.GenericContextInteractionEvent;
+import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
+import net.dv8tion.jda.api.events.interaction.component.GenericComponentInteractionCreateEvent;
+import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.NotNull;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.Closeable;
+import java.lang.reflect.InvocationTargetException;
+import java.time.LocalDateTime;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.LinkedBlockingQueue;
+
+/// A [Runtime] delegates the jda events to their corresponding [EventHandler] and manages the used virtual threads.
+///
+/// A new [Runtime] is created each time an [SlashCommandInteractionEvent], [GenericContextInteractionEvent] or [CommandAutoCompleteInteractionEvent] is provided by jda
+/// or if an interaction is marked as 'independent'.
+/// Runtimes are executed in parallel, but events are processed sequentially by each runtime.
+/// Every [EventHandler] called by this [Runtime] is executed in its own virtual thread, isolated from the runtime one.
+///
+/// @implNote Each [Runtime] is based on a [BlockingQueue] in which jda events, belonging to this
+/// runtime, are put by the [JDAEventListener] running on the jda event thread.
+/// Each runtime than has its own virtual thread that takes events from this queue and executes them sequentially but
+/// each in its own (sub) virtual thread. Therefore, the virtual thread in which the user code will be called, only exists for
+/// the lifespan of one "interaction" and cannot interfere with other interactions on the same or other runtimes.
+@ApiStatus.Internal
+public final class Runtime implements Closeable {
+
+    private static final Logger log = LoggerFactory.getLogger(Runtime.class);
+    private final ExpirationStrategy expirationStrategy;
+    private final SlashCommandHandler slashCommandHandler;
+    private final AutoCompleteHandler autoCompleteHandler;
+    private final ContextCommandHandler contextCommandHandler;
+    private final ComponentHandler componentHandler;
+    private final String id;
+    private final Map<Class<?>, Object> instances;
+    private final BlockingQueue<GenericInteractionCreateEvent> blockingQueue;
+    private final Thread executionThread;
+    private final KeyValueStore keyValueStore = new KeyValueStore();
+    private final ModalHandler modalHandler;
+    private LocalDateTime lastActivity = LocalDateTime.now();
+
+    private Runtime(@NotNull String id, @NotNull DispatchingContext dispatchingContext) {
+        this.id = id;
+        this.instances = new HashMap<>();
+        expirationStrategy = dispatchingContext.expirationStrategy();
+        blockingQueue = new LinkedBlockingQueue<>();
+        slashCommandHandler = new SlashCommandHandler(dispatchingContext);
+        autoCompleteHandler = new AutoCompleteHandler(dispatchingContext);
+        contextCommandHandler = new ContextCommandHandler(dispatchingContext);
+        componentHandler = new ComponentHandler(dispatchingContext);
+        modalHandler = new ModalHandler(dispatchingContext);
+        this.executionThread = Thread.ofVirtual()
+                .name("JDAC Runtime-Thread %s".formatted(id))
+                .uncaughtExceptionHandler((_, e) -> log.error("Error in JDA-Commands Runtime:", e))
+                .unstarted(this::checkForEvents);
+    }
+
+    @NotNull
+    public static Runtime startNew(String id, DispatchingContext dispatchingContext) {
+        var runtime = new Runtime(id, dispatchingContext);
+        runtime.executionThread.start();
+
+        log.debug("Created new runtime with id {}", id);
+
+        return runtime;
+    }
+
+    private void checkForEvents() {
+        try {
+            while (!Thread.interrupted()) {
+                GenericInteractionCreateEvent incomingEvent = blockingQueue.take();
+
+                Thread.ofVirtual().name("JDAC EventHandler-Thread %s".formatted(id)).start(() -> executeHandler(incomingEvent)).join();
+            }
+        } catch (InterruptedException _) {
+        }
+
+        log.debug("Runtime finished");
+    }
+
+    private void executeHandler(GenericInteractionCreateEvent incomingEvent) {
+        lastActivity = LocalDateTime.now();
+        switch (incomingEvent) {
+            case SlashCommandInteractionEvent event -> slashCommandHandler.accept(event, this);
+            case GenericContextInteractionEvent<?> event -> contextCommandHandler.accept(event, this);
+            case CommandAutoCompleteInteractionEvent event -> autoCompleteHandler.accept(event, this);
+            case GenericComponentInteractionCreateEvent event -> componentHandler.accept(event, this);
+            case ModalInteractionEvent event -> modalHandler.accept(event, this);
+            default ->
+                    throw new IllegalStateException("Should not occur. Please report this error the the devs of jda-commands.");
+        }
+    }
+
+    @NotNull
+    public String id() {
+        return id;
+    }
+
+    public void queueEvent(GenericInteractionCreateEvent event) {
+        blockingQueue.add(event);
+    }
+
+    @NotNull
+    public KeyValueStore keyValueStore() {
+        return keyValueStore;
+    }
+
+    public Object instance(GenericInteractionDefinition definition) {
+        return instances.computeIfAbsent(definition.getMethod().getClass(), _ -> {
+            try {
+                return definition.newInstance();
+            } catch (InvocationTargetException | InstantiationException | IllegalAccessException e) {
+                throw new RuntimeException(e);
+            }
+        });
+    }
+
+    @Override
+    public void close() {
+        executionThread.interrupt();
+    }
+
+    public boolean isClosed() {
+        if (expirationStrategy instanceof ExpirationStrategy.Inactivity(long minutes) &&
+                lastActivity.isBefore(LocalDateTime.now().minusMinutes(minutes))) {
+            close();
+            return true;
+        }
+
+        return !executionThread.isAlive();
+    }
+}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/Middleware.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/Middleware.java
index 3660b336b..302867b57 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/Middleware.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/Middleware.java
@@ -1,13 +1,13 @@
 package com.github.kaktushose.jda.commands.dispatching.middleware;
 
-import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
+import com.github.kaktushose.jda.commands.dispatching.context.InvocationContext;
 import net.dv8tion.jda.api.utils.messages.MessageCreateData;
 
 import java.util.function.Consumer;
 
 /**
  * Middlewares run just before an interaction event gets dispatched. They are used to perform additional checks or add
- * more info the {@link Context}. Either register them at the {@link MiddlewareRegistry} or use the
+ * more info the {@link InvocationContext}. Either register them at the {@link MiddlewareRegistry} or use the
  * {@link com.github.kaktushose.jda.commands.annotations.Implementation Implementation} annotation. Middlewares can have
  * different {@link Priority Priorities} dictating their priority on execution.
  *
@@ -16,14 +16,14 @@
  * @since 4.0.0
  */
 @FunctionalInterface
-public interface Middleware extends Consumer<Context> {
+public interface Middleware extends Consumer<InvocationContext<?>> {
 
     /**
-     * Executes this middleware with the given {@link Context}. Use {@link Context#setCancelled(MessageCreateData)}
+     * Executes this middleware with the given {@link InvocationContext}. Use {@link InvocationContext#cancel(MessageCreateData)}
      * to cancel the execution chain.
      *
-     * @param context the {@link Context} of the current interaction event
+     * @param context the {@link InvocationContext} of the current interaction event
      */
-    void accept(Context context);
+    void accept(InvocationContext<?> context);
 
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/MiddlewareRegistry.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/MiddlewareRegistry.java
index 0cf968558..d98c94883 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/MiddlewareRegistry.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/MiddlewareRegistry.java
@@ -1,12 +1,10 @@
 package com.github.kaktushose.jda.commands.dispatching.middleware;
 
-import com.github.kaktushose.jda.commands.dispatching.middleware.impl.ConstraintMiddleware;
-import com.github.kaktushose.jda.commands.dispatching.middleware.impl.CooldownMiddleware;
-import com.github.kaktushose.jda.commands.dispatching.middleware.impl.PermissionsMiddleware;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.util.*;
+import java.util.function.Consumer;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -18,20 +16,12 @@
 public class MiddlewareRegistry {
 
     private static final Logger log = LoggerFactory.getLogger(MiddlewareRegistry.class);
-    private final Map<Priority, Set<Middleware>> middlewares;
-
-    /**
-     * Constructs a new MiddlewareRegistry.
-     */
-    public MiddlewareRegistry() {
-        middlewares = new HashMap<>();
-        middlewares.put(Priority.LOW, new HashSet<>());
-        middlewares.put(Priority.NORMAL, new HashSet<>());
-        middlewares.put(Priority.HIGH, new HashSet<>());
-        middlewares.put(Priority.PERMISSIONS, new HashSet<>());
-        register(Priority.PERMISSIONS, new PermissionsMiddleware());
-        register(Priority.NORMAL, new ConstraintMiddleware(), new CooldownMiddleware());
-    }
+    private final SortedMap<Priority, Set<Middleware>> middlewares = new TreeMap<>(Map.of(
+            Priority.PERMISSIONS, new HashSet<>(),
+            Priority.HIGH, new HashSet<>(),
+            Priority.NORMAL, new HashSet<>(),
+            Priority.LOW, new HashSet<>()
+    ));
 
     /**
      * Register {@link Middleware Middleware(s)} with the given {@link Priority}.
@@ -91,7 +81,16 @@ public MiddlewareRegistry unregister(Priority priority, Collection<Middleware> m
      * @return a set of all registered middlewares {@link Middleware Middlewares}
      */
     public Set<Middleware> getMiddlewares() {
-        return middlewares.values().stream().flatMap(Collection::stream).collect(Collectors.toUnmodifiableSet());
+        return middlewares.sequencedValues()
+                .stream()
+                .flatMap(Collection::stream)
+                .collect(Collectors.toUnmodifiableSet());
+    }
+
+    public void forAllOrdered(Consumer<Middleware> task) {
+        for (Set<Middleware> value : middlewares.values()) {
+            value.forEach(task);
+        }
     }
 
     /**
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/Priority.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/Priority.java
index d2671ea64..b2586056a 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/Priority.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/Priority.java
@@ -6,21 +6,22 @@
  * @see MiddlewareRegistry
  * @since 4.0.0
  */
+// !! order matters, because enums are compared by ordinal number (java.lang.Comparable)
 public enum Priority {
     /**
-     * Lowest priority, will be executed at the end
-     */
-    LOW,
-    /**
-     * Default priority.
+     * Middlewares with priority PERMISSIONS will always be executed first
      */
-    NORMAL,
+    PERMISSIONS,
     /**
      * Highest priority for custom implementation, will be executed right after internal middlewares.
      */
     HIGH,
     /**
-     * Middlewares with priority PERMISSIONS will always be executed first
+     * Default priority.
+     */
+    NORMAL,
+    /**
+     * Lowest priority, will be executed at the end
      */
-    PERMISSIONS
+    LOW
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/ConstraintMiddleware.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/ConstraintMiddleware.java
index c58799f31..92be28ce9 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/ConstraintMiddleware.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/ConstraintMiddleware.java
@@ -1,18 +1,17 @@
 package com.github.kaktushose.jda.commands.dispatching.middleware.impl;
 
-import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
-import com.github.kaktushose.jda.commands.dispatching.interactions.commands.SlashCommandContext;
+import com.github.kaktushose.jda.commands.dispatching.context.InvocationContext;
 import com.github.kaktushose.jda.commands.dispatching.middleware.Middleware;
 import com.github.kaktushose.jda.commands.reflect.ConstraintDefinition;
+import com.github.kaktushose.jda.commands.reflect.ImplementationRegistry;
 import com.github.kaktushose.jda.commands.reflect.ParameterDefinition;
 import com.github.kaktushose.jda.commands.reflect.interactions.commands.SlashCommandDefinition;
-import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
 import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.ArrayList;
 import java.util.List;
-import java.util.Objects;
 
 /**
  * A {@link Middleware} implementation that will check the parameter constraints a
@@ -25,20 +24,25 @@ public class ConstraintMiddleware implements Middleware {
 
     private static final Logger log = LoggerFactory.getLogger(ConstraintMiddleware.class);
 
+    private final ImplementationRegistry implementationRegistry;
+
+    public ConstraintMiddleware(ImplementationRegistry implementationRegistry) {
+        this.implementationRegistry = implementationRegistry;
+    }
+
     /**
-     * Checks if all parameters fulfill their constraints. Will cancel the {@link Context} if a parameter
+     * Checks if all parameters fulfill their constraints. Will cancel the {@link InvocationContext} if a parameter
      * constraint fails.
      *
-     * @param ctx the {@link Context} to filter
+     * @param context the {@link InvocationContext} to filter
      */
     @Override
-    public void accept(@NotNull Context ctx) {
-        if (!SlashCommandInteractionEvent.class.isAssignableFrom(ctx.getEvent().getClass())) {
+    public void accept(@NotNull InvocationContext<?> context) {
+        if (!(context.definition() instanceof SlashCommandDefinition command))
             return;
-        }
-        SlashCommandContext context = (SlashCommandContext) ctx;
-        List<Object> arguments = context.getArguments();
-        List<ParameterDefinition> parameters = Objects.requireNonNull(context.getCommand()).getParameters();
+
+        var arguments = new ArrayList<>(context.arguments());
+        List<ParameterDefinition> parameters = command.getParameters();
 
         log.debug("Applying parameter constraints...");
         for (int i = 1; i < arguments.size(); i++) {
@@ -50,10 +54,10 @@ public void accept(@NotNull Context ctx) {
                 boolean validated = constraint.validator().apply(argument, constraint.annotation(), context);
 
                 if (!validated) {
-                    context.setCancelled(
-                            context.getImplementationRegistry()
+                    context.cancel(
+                            implementationRegistry
                                     .getErrorMessageFactory()
-                                    .getConstraintFailedMessage(context, constraint)
+                                    .getConstraintFailedMessage(constraint)
                     );
                     log.debug("Constraint failed!");
                     return;
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/CooldownMiddleware.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/CooldownMiddleware.java
index 638b4aa1a..f56be324f 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/CooldownMiddleware.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/CooldownMiddleware.java
@@ -1,17 +1,20 @@
 package com.github.kaktushose.jda.commands.dispatching.middleware.impl;
 
 import com.github.kaktushose.jda.commands.annotations.interactions.Cooldown;
-import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
-import com.github.kaktushose.jda.commands.dispatching.interactions.commands.SlashCommandContext;
+import com.github.kaktushose.jda.commands.dispatching.context.InvocationContext;
 import com.github.kaktushose.jda.commands.dispatching.middleware.Middleware;
 import com.github.kaktushose.jda.commands.reflect.CooldownDefinition;
+import com.github.kaktushose.jda.commands.reflect.ImplementationRegistry;
 import com.github.kaktushose.jda.commands.reflect.interactions.commands.SlashCommandDefinition;
-import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
 import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.*;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 
 /**
  * A {@link Middleware} implementation that contains the business logic behind command cooldowns.
@@ -25,30 +28,25 @@
 public class CooldownMiddleware implements Middleware {
 
     private static final Logger log = LoggerFactory.getLogger(CooldownMiddleware.class);
-    private final Map<Long, Set<CooldownEntry>> activeCooldowns;
+    private final Map<Long, Set<CooldownEntry>> activeCooldowns = new ConcurrentHashMap<>();
 
-    public CooldownMiddleware() {
-        activeCooldowns = new HashMap<>();
+    private final ImplementationRegistry implementationRegistry;
+
+    public CooldownMiddleware(ImplementationRegistry implementationRegistry) {
+        this.implementationRegistry = implementationRegistry;
     }
 
     /**
      * Checks if an active cooldown for the given {@link SlashCommandDefinition} exists and will eventually cancel the
      * context.
      *
-     * @param context the {@link Context} to filter
+     * @param context the {@link InvocationContext} to filter
      */
     @Override
-    public void accept(@NotNull Context context) {
-        if (!SlashCommandInteractionEvent.class.isAssignableFrom(context.getEvent().getClass())) {
-            return;
-        }
-        SlashCommandDefinition command = ((SlashCommandContext) context).getCommand();
-
-        if (!command.hasCooldown()) {
-            return;
-        }
+    public void accept(@NotNull InvocationContext<?> context) {
+        if (!(context.definition() instanceof SlashCommandDefinition command) || !command.hasCooldown()) return;
 
-        long id = context.getEvent().getUser().getIdLong();
+        long id = context.event().getUser().getIdLong();
 
         activeCooldowns.putIfAbsent(id, new HashSet<>());
 
@@ -60,7 +58,7 @@ public void accept(@NotNull Context context) {
             if (remaining <= 0) {
                 activeCooldowns.get(id).remove(entry);
             } else {
-                context.setCancelled(context.getImplementationRegistry().getErrorMessageFactory().getCooldownMessage(context, remaining));
+                context.cancel(implementationRegistry.getErrorMessageFactory().getCooldownMessage(remaining));
                 log.debug("Command has a remaining cooldown of {} ms!", remaining);
                 return;
             }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/PermissionsMiddleware.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/PermissionsMiddleware.java
index 13209a6ef..aa8149205 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/PermissionsMiddleware.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/PermissionsMiddleware.java
@@ -1,9 +1,10 @@
 package com.github.kaktushose.jda.commands.dispatching.middleware.impl;
 
 import com.github.kaktushose.jda.commands.annotations.interactions.Permissions;
-import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
+import com.github.kaktushose.jda.commands.dispatching.context.InvocationContext;
 import com.github.kaktushose.jda.commands.dispatching.middleware.Middleware;
 import com.github.kaktushose.jda.commands.permissions.PermissionsProvider;
+import com.github.kaktushose.jda.commands.reflect.ImplementationRegistry;
 import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.User;
 import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent;
@@ -15,9 +16,9 @@
  * A {@link Middleware} implementation that will check permissions.
  * The default implementation can only handle discord permissions. However, the {@link PermissionsProvider} can be
  * used for own implementations.
- * This filter will first check against {@link PermissionsProvider#hasPermission(User, Context)} with a
+ * This filter will first check against {@link PermissionsProvider#hasPermission(User, InvocationContext)} with a
  * {@link User} object. This can be used for global permissions. Afterward
- * {@link PermissionsProvider#hasPermission(Member, Context)} will be called. Since the {@link Member} is
+ * {@link PermissionsProvider#hasPermission(User, InvocationContext)} will be called. Since the {@link Member} is
  * available this might be used for guild related permissions.
  *
  * @see Permissions
@@ -28,16 +29,22 @@ public class PermissionsMiddleware implements Middleware {
 
     private static final Logger log = LoggerFactory.getLogger(PermissionsMiddleware.class);
 
+    private final ImplementationRegistry implementationRegistry;
+
+    public PermissionsMiddleware(ImplementationRegistry implementationRegistry) {
+        this.implementationRegistry = implementationRegistry;
+    }
+
     /**
      * Checks if the {@link User} and respectively the {@link Member} has the permission to execute the command.
      *
-     * @param context the {@link Context} to filter
+     * @param context the {@link InvocationContext} to filter
      */
     @Override
-    public void accept(@NotNull Context context) {
+    public void accept(@NotNull InvocationContext<?> context) {
         log.debug("Checking permissions...");
-        PermissionsProvider provider = context.getImplementationRegistry().getPermissionsProvider();
-        GenericInteractionCreateEvent event = context.getEvent();
+        PermissionsProvider provider = implementationRegistry.getPermissionsProvider();
+        GenericInteractionCreateEvent event = context.event();
 
         boolean hasPerms;
         if (event.getMember() != null) {
@@ -46,7 +53,7 @@ public void accept(@NotNull Context context) {
             hasPerms = provider.hasPermission(event.getUser(), context);
         }
         if (!hasPerms) {
-            context.setCancelled(context.getImplementationRegistry().getErrorMessageFactory().getInsufficientPermissionsMessage(context));
+            context.cancel(implementationRegistry.getErrorMessageFactory().getInsufficientPermissionsMessage(context.definition()));
             log.debug("Insufficient permissions!");
             return;
         }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/package-info.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/package-info.java
new file mode 100644
index 000000000..1f2eb3433
--- /dev/null
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/package-info.java
@@ -0,0 +1,2 @@
+/// Implementations of commonly used Middlewares, such as permissions or cooldown handling.
+package com.github.kaktushose.jda.commands.dispatching.middleware.impl;
\ No newline at end of file
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/package-info.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/package-info.java
new file mode 100644
index 000000000..64e2bf0bf
--- /dev/null
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/package-info.java
@@ -0,0 +1,2 @@
+/// Middlewares get executed between preparation and method invocation.
+package com.github.kaktushose.jda.commands.dispatching.middleware;
\ No newline at end of file
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/Component.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/Component.java
new file mode 100644
index 000000000..b7ffc4fe6
--- /dev/null
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/Component.java
@@ -0,0 +1,65 @@
+package com.github.kaktushose.jda.commands.dispatching.reply;
+
+import com.github.kaktushose.jda.commands.annotations.interactions.Button;
+import com.github.kaktushose.jda.commands.annotations.interactions.EntitySelectMenu;
+import com.github.kaktushose.jda.commands.annotations.interactions.StringSelectMenu;
+
+import java.util.Arrays;
+
+/// Represents a component, namely [Button], [StringSelectMenu] or [EntitySelectMenu], that should be added to a reply.
+///
+/// Also holds the following two settings:
+/// - enabled:
+///
+/// to enable or disable the component
+/// - independent:
+///
+/// whether the component should be executed in the same [`Runtime`]({@docRoot}/index.html#runtime-concept-heading) as the command it is bound to or not. If `true`,
+/// every component interaction will create a new [`Runtime`]({@docRoot}/index.html#runtime-concept-heading). Furthermore, the component cannot expire and will always
+/// get executed, even after a bot restart.
+///
+/// ### Example:
+/// ```
+/// @SlashCommand("example command")
+/// public void onCommand(CommandEvent event) {
+///     event.with().components(Components.of(true, false, "onButton")).reply();
+/// }
+///```
+/// @since 2.3.0
+public record Component(boolean enabled, boolean independent, String name) {
+
+    /// Adds enabled, runtime-bound [Component]s to the reply.
+    ///
+    /// @param components the name of the method that represents the component
+    public static Component[] enabled(String... components) {
+        return of(true, false, components);
+    }
+
+    /// Adds disabled, runtime-bound [Component]s to the reply.
+    ///
+    /// @param components the name of the method that represents the component
+    public static Component[] disabled(String... components) {
+        return of(false, false, components);
+    }
+
+    /// Adds enabled, runtime-independent [Component]s to the reply.
+    ///
+    /// Every component interaction will create a new [`Runtime`]({@docRoot}/index.html#runtime-concept-heading). Furthermore, the component cannot expire and
+    /// will always get executed, even after a bot restart.
+    ///
+    /// @param components the name of the method that represents the component
+    public static Component[] independent(String... components) {
+        return of(true, true, components);
+    }
+
+    /// Adds [Component]s with the passed configuration to the reply.
+    ///
+    /// @param enabled     whether the [Component] should be enabled or disabled
+    /// @param independent whether the [Component] should be runtime-bound or independent
+    /// @param components  the name of the method that represents the component
+    public static Component[] of(boolean enabled, boolean independent, String... components) {
+        return Arrays.stream(components)
+                .map(it -> new Component(enabled, independent, it))
+                .toArray(Component[]::new);
+    }
+}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/ComponentReply.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/ComponentReply.java
new file mode 100644
index 000000000..459223fc3
--- /dev/null
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/ComponentReply.java
@@ -0,0 +1,23 @@
+package com.github.kaktushose.jda.commands.dispatching.reply;
+
+import net.dv8tion.jda.api.entities.Message;
+import org.jetbrains.annotations.NotNull;
+
+/// Subtype of [ConfigurableReply] that allows replying only with a name without a message.
+///
+/// @since 4.0.0
+public final class ComponentReply extends ConfigurableReply {
+
+    /// Constructs a new ComponentReply.
+    ///
+    /// @param reply the underlying [ConfigurableReply]
+    public ComponentReply(@NotNull ConfigurableReply reply) {
+        super(reply);
+    }
+
+    /// Sends the reply to Discord.
+    public Message reply() {
+        return complete();
+    }
+
+}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/ConfigurableReply.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/ConfigurableReply.java
new file mode 100644
index 000000000..2d0177b60
--- /dev/null
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/ConfigurableReply.java
@@ -0,0 +1,198 @@
+package com.github.kaktushose.jda.commands.dispatching.reply;
+
+import com.github.kaktushose.jda.commands.annotations.interactions.ReplyConfig;
+import com.github.kaktushose.jda.commands.dispatching.internal.Runtime;
+import com.github.kaktushose.jda.commands.reflect.InteractionRegistry;
+import com.github.kaktushose.jda.commands.reflect.interactions.components.ButtonDefinition;
+import com.github.kaktushose.jda.commands.reflect.interactions.components.GenericComponentDefinition;
+import com.github.kaktushose.jda.commands.reflect.interactions.components.menus.GenericSelectMenuDefinition;
+import net.dv8tion.jda.api.interactions.components.ActionRow;
+import net.dv8tion.jda.api.interactions.components.ItemComponent;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/// Subtype of [MessageReply] that supports adding components to messages and changing the [ReplyConfig].
+///
+/// ### Example:
+/// ```
+/// @Interaction
+/// public class ExampleCommand {
+///
+///     @SlashCommand(value = "example command")
+///     public void onCommand(CommandEvent event) {
+///         event.with().components(buttons("onButton")).reply("Hello World");
+///     }
+///
+///     @Button("Press me!")
+///     public void onButton(ComponentEvent event) {
+///         event.reply("You pressed me!");
+///     }
+/// }
+/// ```
+///
+/// @since 4.0.0
+public sealed class ConfigurableReply extends MessageReply permits ComponentReply {
+
+    protected final InteractionRegistry interactionRegistry;
+    protected final String runtimeId;
+
+    /// Constructs a new ConfigurableReply.
+    ///
+    /// @param reply     the underlying [MessageReply]
+    /// @param registry  the corresponding [InteractionRegistry]
+    /// @param runtimeId the corresponding [Runtime]
+    public ConfigurableReply(@NotNull MessageReply reply, @NotNull InteractionRegistry registry, @NotNull String runtimeId) {
+        super(reply);
+        this.interactionRegistry = registry;
+        this.runtimeId = runtimeId;
+    }
+
+    /// Constructs a new ConfigurableReply.
+    ///
+    /// @param reply the [ConfigurableReply] to copy
+    public ConfigurableReply(@NotNull ConfigurableReply reply) {
+        super(reply);
+        this.interactionRegistry = reply.interactionRegistry;
+        this.runtimeId = reply.runtimeId;
+    }
+
+    /// Whether to send ephemeral replies. Default value is `false`.
+    ///
+    /// Ephemeral messages have some limitations and will be removed once the user restarts their client.
+    /// Limitations:
+    /// - Cannot contain any files/ attachments
+    /// - Cannot be reacted to
+    /// - Cannot be retrieved
+    ///
+    /// **This will override both [GlobalReplyConfig] and any [ReplyConfig] annotation!**
+    ///
+    /// @param ephemeral `true` if to send ephemeral replies
+    /// @return the current instance for fluent interface
+    @NotNull
+    public ConfigurableReply ephemeral(boolean ephemeral) {
+        this.ephemeral = ephemeral;
+        return this;
+    }
+
+    /// Whether to keep the original components when editing a message. Default value is `true`.
+    ///
+    /// More formally, if editing a message and `keepComponents` is `true`, the original message will first be queried and
+    /// its components get added to the reply before it is sent.
+    ///
+    /// **This will override both [GlobalReplyConfig] and any [ReplyConfig] annotation!**
+    ///
+    /// @param editReply `true` if to keep the original components
+    /// @return the current instance for fluent interface
+    @NotNull
+    public ConfigurableReply editReply(boolean editReply) {
+        this.editReply = editReply;
+        return this;
+    }
+
+    /// Whether to edit the original message or to send a new one. Default value is `true`.
+    ///
+    /// The original message is always the very first reply that was sent. E.g. for a slash command event, which was
+    /// replied to with a text message and a button, the original message is that very reply.
+    ///
+    /// Subsequent replies to the same slash command event or the button event cannot be edited.
+    ///
+    /// **This will override both [GlobalReplyConfig] and any [ReplyConfig] annotation!**
+    ///
+    /// @param keepComponents `true` if to edit the original method
+    /// @return the current instance for fluent interface
+    @NotNull
+    public ConfigurableReply keepComponents(boolean keepComponents) {
+        this.keepComponents = keepComponents;
+        return this;
+    }
+
+    /// Adds an [ActionRow] to the reply and adds the passed components to it.
+    ///
+    /// The components will always be enabled and runtime-bound. Use [#components(Component...)] if you want to modify these
+    /// settings.
+    ///
+    /// **The components must be defined in the same class where this method gets called!**
+    ///
+    /// ### Example:
+    /// ```
+    /// @Interaction
+    /// public class ExampleCommand {
+    ///
+    ///     @SlashCommand(value = "example command")
+    ///     public void onCommand(CommandEvent event) {
+    ///         event.with().components("onButton").reply("Hello World");
+    ///     }
+    ///
+    ///     @Button("Press me!")
+    ///     public void onButton(ComponentEvent event) {
+    ///         event.reply("You pressed me!");
+    ///     }
+    /// }
+    /// ```
+    ///
+    /// @param components the name of the components to add
+    /// @return the current instance for fluent interface
+    @NotNull
+    public ComponentReply components(@NotNull String... components) {
+        return components(Component.of(true, false, components));
+    }
+
+    /// Adds an [ActionRow] to the reply and adds the passed [Component] to it.
+    ///
+    /// **The components must be defined in the same class where this method gets called!**
+    ///
+    /// ### Example:
+    /// ```
+    /// @Interaction
+    /// public class ExampleCommand {
+    ///
+    ///     @SlashCommand(value = "example command")
+    ///     public void onCommand(CommandEvent event) {
+    ///         event.with().components(Components.disabled("onButton")).reply("Hello World");
+    ///     }
+    ///
+    ///     @Button("Press me!")
+    ///     public void onButton(ComponentEvent event) {
+    ///         event.reply("You pressed me!");
+    ///     }
+    /// }
+    /// ```
+    ///
+    /// @see Component
+    /// @param components the [Component] to add
+    /// @return the current instance for fluent interface
+    @NotNull
+    public ComponentReply components(@NotNull Component... components) {
+        List<ItemComponent> items = new ArrayList<>();
+        for (Component component : components) {
+            var definitionId = String.valueOf((definition.getMethod().getDeclaringClass().getName() + component.name()).hashCode());
+            var definition = interactionRegistry.find(GenericComponentDefinition.class, false, it ->
+                    it.getDefinitionId().equals(definitionId)
+            );
+            log.debug("Reply Debug: Adding component \"{}\" to the reply", definition.getDisplayName());
+            switch (definition) {
+                case ButtonDefinition buttonDefinition -> {
+                    var button = buttonDefinition.toButton().withDisabled(!component.enabled());
+                    //only assign ids to non-link buttons
+                    items.add(button.getUrl() == null ? button.withId(createId(definition, component.independent())) : button);
+                }
+                case GenericSelectMenuDefinition<?> menuDefinition ->
+                        items.add(menuDefinition.toSelectMenu(createId(definition, component.independent()), component.enabled()));
+            }
+        }
+        if (!items.isEmpty()) {
+            builder.addComponents(ActionRow.of(items));
+        }
+
+        return new ComponentReply(this);
+    }
+
+    private String createId(GenericComponentDefinition definition, boolean staticComponent) {
+        return staticComponent
+                ? definition.independentCustomId()
+                : definition.boundCustomId(runtimeId);
+    }
+}
+
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/GlobalReplyConfig.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/GlobalReplyConfig.java
new file mode 100644
index 000000000..b36322302
--- /dev/null
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/GlobalReplyConfig.java
@@ -0,0 +1,31 @@
+package com.github.kaktushose.jda.commands.dispatching.reply;
+
+import com.github.kaktushose.jda.commands.annotations.interactions.ReplyConfig;
+
+/// Will be used if no [ReplyConfig] annotation is present.
+public class GlobalReplyConfig {
+
+    /// Whether to send ephemeral replies. Default value is `false`.
+    ///
+    /// Ephemeral messages have some limitations and will be removed once the user restarts their client.
+    /// Limitations:
+    /// - Cannot contain any files/ attachments
+    /// - Cannot be reacted to
+    /// - Cannot be retrieved
+    public static boolean ephemeral = false;
+
+    /// Whether to keep the original components when editing a message. Default value is `true`.
+    ///
+    /// More formally, if editing a message and `keepComponents` is `true`, the original message will first be queried and
+    /// its components get added to the reply before it is sent.
+    public static boolean keepComponents = true;
+
+    /// Whether to edit the original message or to send a new one. Default value is `true`.
+    ///
+    /// The original message is always the very first reply that was sent. E.g. for a slash command event, which was
+    /// replied to with a text message and a button, the original message is that very reply.
+    ///
+    /// Subsequent replies to the same slash command event or the button event are not affected.
+    public static boolean editReply = true;
+
+}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/MessageReply.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/MessageReply.java
new file mode 100644
index 000000000..b5cf325d3
--- /dev/null
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/MessageReply.java
@@ -0,0 +1,147 @@
+package com.github.kaktushose.jda.commands.dispatching.reply;
+
+import com.github.kaktushose.jda.commands.dispatching.events.ReplyableEvent;
+import com.github.kaktushose.jda.commands.reflect.interactions.EphemeralInteractionDefinition;
+import com.github.kaktushose.jda.commands.reflect.interactions.GenericInteractionDefinition;
+import com.github.kaktushose.jda.commands.reflect.interactions.ReplyConfig;
+import net.dv8tion.jda.api.EmbedBuilder;
+import net.dv8tion.jda.api.entities.Message;
+import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent;
+import net.dv8tion.jda.api.events.interaction.ModalInteractionEvent;
+import net.dv8tion.jda.api.interactions.InteractionHook;
+import net.dv8tion.jda.api.interactions.callbacks.IDeferrableCallback;
+import net.dv8tion.jda.api.interactions.callbacks.IMessageEditCallback;
+import net.dv8tion.jda.api.interactions.callbacks.IReplyCallback;
+import net.dv8tion.jda.api.utils.messages.MessageCreateBuilder;
+import net.dv8tion.jda.api.utils.messages.MessageCreateData;
+import net.dv8tion.jda.api.utils.messages.MessageEditData;
+import org.jetbrains.annotations.NotNull;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/// Simple builder for sending text messages based on a [GenericInteractionCreateEvent].
+///
+/// More formally, can be used to
+/// send an arbitrary amount of message replies to the text channel the [GenericInteractionCreateEvent] was executed in.
+///
+/// Example:
+/// ```
+/// new MessageReply(event, definition, new ReplyConfig()).reply(errorMessage);
+///```
+///
+/// @see ConfigurableReply
+/// @see ReplyableEvent
+/// @since 4.0.0
+public sealed class MessageReply implements Reply permits ConfigurableReply {
+
+    protected static final Logger log = LoggerFactory.getLogger(MessageReply.class);
+    protected final GenericInteractionCreateEvent event;
+    protected final GenericInteractionDefinition definition;
+    protected final MessageCreateBuilder builder;
+    protected boolean ephemeral;
+    protected boolean editReply;
+    protected boolean keepComponents;
+
+    /// Constructs a new MessageReply.
+    ///
+    /// @param event       the corresponding [GenericInteractionCreateEvent]
+    /// @param definition  the corresponding [GenericInteractionDefinition]. This is mostly needed by the
+    ///                                                         [ConfigurableReply]
+    /// @param replyConfig the [ReplyConfig] to use
+    public MessageReply(@NotNull GenericInteractionCreateEvent event,
+                        @NotNull GenericInteractionDefinition definition,
+                        @NotNull ReplyConfig replyConfig) {
+        this.event = event;
+        this.definition = definition;
+        this.ephemeral = replyConfig.ephemeral();
+        this.editReply = replyConfig.editReply();
+        this.keepComponents = replyConfig.keepComponents();
+        this.builder = new MessageCreateBuilder();
+    }
+
+    /// Constructs a new MessageReply.
+    ///
+    /// @param event      the corresponding [GenericInteractionCreateEvent]
+    /// @param definition the corresponding [EphemeralInteractionDefinition]. This is mostly needed by the
+    ///                                                       [ConfigurableReply]
+    public MessageReply(@NotNull GenericInteractionCreateEvent event, @NotNull EphemeralInteractionDefinition definition) {
+        this(event, definition, definition.replyConfig());
+    }
+
+    /// Constructs a new MessageReply.
+    ///
+    /// @param reply the [MessageReply] to copy
+    public MessageReply(@NotNull MessageReply reply) {
+        this.event = reply.event;
+        this.builder = reply.builder;
+        this.definition = reply.definition;
+        this.ephemeral = reply.ephemeral;
+        this.editReply = reply.editReply;
+        this.keepComponents = reply.keepComponents;
+    }
+
+    public Message reply(@NotNull String message) {
+        builder.setContent(message);
+        return complete();
+    }
+
+    public Message reply(@NotNull MessageCreateData message) {
+        builder.applyData(message);
+        return complete();
+    }
+
+    public Message reply(@NotNull EmbedBuilder builder) {
+        this.builder.setEmbeds(builder.build());
+        return complete();
+    }
+
+    /// Sends the reply to Discord and blocks the current thread until the message was sent.
+    ///
+    /// @return the [Message] that got created
+    /// @implNote This method can handle both message replies and message edits. it will check if the interaction got
+    /// acknowledged and will acknowledge it if necessary before sending or editing a message. After that,
+    /// [InteractionHook#sendMessage(MessageCreateData)] or respectively [InteractionHook#editOriginal(MessageEditData)]
+    /// will be called.
+    ///
+    /// If editing a message and `keepComponents` is `true`, queries the original message first and adds its components
+    /// to the reply before sending it.
+    @NotNull
+    protected Message complete() {
+        switch (event) {
+            case ModalInteractionEvent modalEvent when modalEvent.getMessage() != null && editReply ->
+                    deferEdit(modalEvent);
+            case IMessageEditCallback callback when editReply -> deferEdit(callback);
+            case IReplyCallback callback -> deferReply(callback);
+            default -> throw new IllegalArgumentException(
+                    "Cannot reply to '%s'! Please report this error to the devs of jda-commands!".formatted(event.getClass().getName())
+            );
+        }
+        if (event instanceof ModalInteractionEvent modalEvent) {
+            editReply = modalEvent.getMessage() != null;
+        }
+        log.debug(
+                "Replying to interaction \"{}\" with content: {} [ephemeral={}, editReply={}, keepComponents={}]",
+                definition.getDisplayName(), builder.build().toData(), ephemeral, editReply, keepComponents
+        );
+        var hook = ((IDeferrableCallback) event).getHook();
+        if (editReply) {
+            if (keepComponents) {
+                builder.addComponents(hook.retrieveOriginal().complete().getComponents());
+            }
+            return hook.editOriginal(MessageEditData.fromCreateData(builder.build())).complete();
+        }
+        return hook.setEphemeral(ephemeral).sendMessage(builder.build()).complete();
+    }
+
+    private void deferReply(@NotNull IReplyCallback callback) {
+        if (!event.isAcknowledged()) {
+            callback.deferReply(ephemeral).queue();
+        }
+    }
+
+    private void deferEdit(@NotNull IMessageEditCallback callback) {
+        if (!event.isAcknowledged()) {
+            callback.deferEdit().queue();
+        }
+    }
+}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/ModalReplyable.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/ModalReplyable.java
deleted file mode 100644
index c49e6f403..000000000
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/ModalReplyable.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.github.kaktushose.jda.commands.dispatching.reply;
-
-import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
-import com.github.kaktushose.jda.commands.reflect.interactions.ModalDefinition;
-import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent;
-import net.dv8tion.jda.api.interactions.callbacks.IModalCallback;
-
-/**
- * Generic interface holding reply methods for modal replies.
- *
- * @since 4.0.0
- */
-public interface ModalReplyable extends Replyable {
-
-    /**
-     * Replies to this Interaction with a Modal. This will open a popup on the target user's Discord client.
-     *
-     * @param modal the id of the modal to reply with
-     */
-    default void replyModal(String modal) {
-        IModalCallback callback;
-        Context context = getContext();
-        GenericInteractionCreateEvent event = context.getEvent();
-        if (event instanceof IModalCallback) {
-            callback = (IModalCallback) event;
-        } else {
-            throw new IllegalArgumentException(
-                    String.format("Cannot reply to '%s'! Please report this error to the jda-commands devs!", event.getClass().getName())
-            );
-        }
-
-        ModalDefinition modalDefinition = context.getInteractionRegistry().getModals().stream()
-                .filter(it -> it.getDefinitionId().equals(String.format("%s%s", context.getInteractionDefinition().getMethod().getDeclaringClass().getSimpleName(), modal)))
-                .findFirst()
-                .orElseThrow(() -> new IllegalArgumentException("Unknown Modal"));
-
-        callback.replyModal(modalDefinition.toModal(context.getRuntime().getRuntimeId())).queue();
-    }
-}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/Reply.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/Reply.java
new file mode 100644
index 000000000..b11c0ae39
--- /dev/null
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/Reply.java
@@ -0,0 +1,87 @@
+package com.github.kaktushose.jda.commands.dispatching.reply;
+
+import com.github.kaktushose.jda.commands.embeds.EmbedDTO;
+import com.github.kaktushose.jda.commands.dispatching.events.ReplyableEvent;
+import net.dv8tion.jda.api.EmbedBuilder;
+import net.dv8tion.jda.api.entities.Message;
+import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent;
+import net.dv8tion.jda.api.requests.RestAction;
+import net.dv8tion.jda.api.utils.messages.MessageCreateData;
+import org.jetbrains.annotations.NotNull;
+
+/// Common interface for classes that support simple message replies to [GenericInteractionCreateEvent].
+///
+/// This interface ensures that [ReplyableEvent] and [MessageReply], which is internally used by [ReplyableEvent],
+/// always share the same reply methods.
+///
+/// @see ReplyableEvent
+/// @since 4.0.0
+public sealed interface Reply permits MessageReply, ReplyableEvent {
+
+    /// Acknowledgement of this event with a text message.
+    ///
+    /// @implSpec Internally this method must call [RestAction#complete()], thus the [Message] object can get
+    /// returned directly.
+    ///
+    /// This might throw [RuntimeException]s if JDA fails to send the message.
+    ///
+    /// @param message the message to send
+    /// @return the [Message] that got created
+    Message reply(@NotNull String message);
+
+    /// Acknowledgement of this event with a text message.
+    ///
+    /// @implSpec Internally this method must call [RestAction#complete()], thus the [Message] object can get
+    /// returned directly.
+    ///
+    /// This might throw [RuntimeException]s if JDA fails to send the message.
+    ///
+    /// @param format the message to send
+    /// @param args   Arguments referenced by the format specifiers in the format string. If there are more arguments than
+    ///               format specifiers, the extra arguments are ignored. The number of arguments is variable and may be
+    ///               zero.
+    /// @return the [Message] that got created
+    /// @throws java.util.IllegalFormatException If a format string contains an illegal syntax, a format specifier that
+    ///                                         is incompatible with the given arguments, insufficient arguments given
+    ///                                         the format string, or other illegal conditions
+    ///                                                                                                                                                                                                                                                                                                is incompatible with the given arguments, insufficient arguments given
+    ///                                                                                                                                                                                                                                                                                               the format string, or other illegal conditions.
+    default Message reply(@NotNull String format, @NotNull Object... args) {
+        return reply(format.formatted(args));
+    }
+
+    /// Acknowledgement of this event with a text message.
+    ///
+    /// @implSpec Internally this method must call [RestAction#complete()], thus the [Message] object can get
+    /// returned directly.
+    ///
+    /// This might throw [RuntimeException]s if JDA fails to send the message.
+    ///
+    /// @param message the [MessageCreateData] to send
+    /// @return the [Message] that got created
+    Message reply(@NotNull MessageCreateData message);
+
+    /// Acknowledgement of this event with a text message.
+    ///
+    /// @implSpec Internally this method must call [RestAction#complete()], thus the [Message] object can get
+    /// returned directly.
+    ///
+    /// This might throw [RuntimeException]s if JDA fails to send the message.
+    ///
+    /// @param builder the [EmbedBuilder] to send
+    /// @return the [Message] that got created
+    Message reply(@NotNull EmbedBuilder builder);
+
+    /// Acknowledgement of this event with a text message.
+    ///
+    /// @implSpec Internally this method must call [RestAction#complete()], thus the [Message] object can get
+    /// returned directly.
+    ///
+    /// This might throw [RuntimeException]s if JDA fails to send the message.
+    ///
+    /// @param embedDTO the [EmbedDTO] to send
+    /// @return the [Message] that got created
+    default Message reply(@NotNull EmbedDTO embedDTO) {
+        return reply(embedDTO.toEmbedBuilder());
+    }
+}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/ReplyContext.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/ReplyContext.java
deleted file mode 100644
index 940c83d70..000000000
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/ReplyContext.java
+++ /dev/null
@@ -1,246 +0,0 @@
-package com.github.kaktushose.jda.commands.dispatching.reply;
-
-import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
-import com.github.kaktushose.jda.commands.dispatching.interactions.commands.SlashCommandContext;
-import net.dv8tion.jda.api.entities.Message;
-import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent;
-import net.dv8tion.jda.api.events.interaction.ModalInteractionEvent;
-import net.dv8tion.jda.api.interactions.callbacks.IMessageEditCallback;
-import net.dv8tion.jda.api.interactions.callbacks.IReplyCallback;
-import net.dv8tion.jda.api.utils.messages.MessageCreateBuilder;
-import net.dv8tion.jda.api.utils.messages.MessageCreateData;
-import net.dv8tion.jda.api.utils.messages.MessageEditData;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.function.Consumer;
-
-/**
- * This class models a reply to an interaction. It is mainly used by the {@link Replyable} interface to construct a
- * reply but can also be accessed directly.
- *
- * @since 4.0.0
- */
-public class ReplyContext {
-
-    private static final Logger log = LoggerFactory.getLogger(ReplyContext.class);
-    private final GenericInteractionCreateEvent event;
-    private final MessageCreateBuilder builder;
-    private Consumer<Message> success;
-    private Consumer<Throwable> failure;
-    private boolean editReply;
-    private boolean keepComponents;
-    private boolean ephemeralReply;
-
-    /**
-     * Constructs a new ReplyContext.
-     *
-     * @param context the corresponding {@link SlashCommandContext}
-     */
-    public ReplyContext(Context context) {
-        event = context.getEvent();
-        builder = new MessageCreateBuilder();
-        success = (message) -> {
-        };
-        failure = (throwable) -> {
-            log.error("The response request encountered an exception at its execution point!", new InvocationTargetException(throwable));
-        };
-        editReply = true;
-        keepComponents = true;
-        ephemeralReply = context.isEphemeral();
-    }
-
-    /**
-     * Transforms this ReplyContext to a {@link MessageCreateData}. This is equal to {@code getBuilder().build()}.
-     *
-     * @return the {@link MessageCreateData}
-     */
-    public MessageCreateData toMessageCreateData() {
-        return builder.build();
-    }
-
-    /**
-     * Transforms this ReplyContext to a {@link MessageEditData}.
-     *
-     * @return the {@link MessageEditData}
-     */
-    public MessageEditData toMessageEditData() {
-        return MessageEditData.fromCreateData(toMessageCreateData());
-    }
-
-    /**
-     * Returns the underlying {@link MessageCreateBuilder}.
-     *
-     * @return the underlying {@link MessageCreateBuilder}
-     */
-    public MessageCreateBuilder getBuilder() {
-        return builder;
-    }
-
-    /**
-     * Returns the success callback.
-     *
-     * @return the success callback
-     */
-    public Consumer<Message> getSuccessCallback() {
-        return success;
-    }
-
-    /**
-     * Sets the success callback.
-     *
-     * @return this instance
-     */
-    public ReplyContext setSuccessCallback(Consumer<Message> consumer) {
-        this.success = consumer;
-        return this;
-    }
-
-    /**
-     * Returns the failure callback.
-     *
-     * @return the failure callback
-     */
-    public Consumer<Throwable> getFailureCallback() {
-        return failure;
-    }
-
-    /**
-     * Returns the failure callback.
-     *
-     * @return this instance
-     */
-    public ReplyContext setFailureCallback(Consumer<Throwable> consumer) {
-        this.failure = consumer;
-        return this;
-    }
-
-    /**
-     * Whether this reply should edit the original message.
-     *
-     * @return {@code true} if this reply should edit the original message
-     */
-    public boolean isEditReply() {
-        return editReply;
-    }
-
-    /**
-     * Whether this reply should edit the original message.
-     *
-     * @param editReply {@code true} if this reply should edit the original message
-     * @return this instance
-     */
-    public ReplyContext setEditReply(boolean editReply) {
-        this.editReply = editReply;
-        return this;
-    }
-
-    /**
-     * Whether this reply should keep all components of the original message.
-     *
-     * @return {@code true} this reply should keep all components of the original message
-     */
-    public boolean isKeepComponents() {
-        return keepComponents;
-    }
-
-    /**
-     * Whether this reply should keep all components of the original message.
-     *
-     * @param keepComponents {@code true} this reply should keep all components of the original message
-     * @return this instance
-     */
-    public ReplyContext setKeepComponents(boolean keepComponents) {
-        this.keepComponents = keepComponents;
-        return this;
-    }
-
-    /**
-     * Whether this reply should be ephemeral.
-     *
-     * @return this instance
-     */
-    public boolean isEphemeralReply() {
-        return ephemeralReply;
-    }
-
-    /**
-     * Whether this reply should be ephemeral.
-     *
-     * @return {@code true} if this reply should be ephemeral
-     */
-    public ReplyContext setEphemeralReply(boolean ephemeralReply) {
-        this.ephemeralReply = ephemeralReply;
-        return this;
-    }
-
-    /**
-     * Removes all components from the last message that was sent. <b>This will only work with
-     * {@link #setEditReply(boolean)} set to true.</b>
-     */
-    public void removeComponents() {
-        IReplyCallback callback;
-        if (event instanceof IReplyCallback) {
-            callback = (IReplyCallback) event;
-        } else {
-            throw new IllegalArgumentException(
-                    String.format("Cannot reply to '%s'! Please report this error to the jda-commands devs!", event.getClass().getName())
-            );
-        }
-        if (!event.isAcknowledged()) {
-            callback.deferReply(false).queue();
-        }
-        if (editReply) {
-            callback.getHook().editOriginalComponents().queue();
-        } else {
-            log.warn("Cannot remove components with 'editReply' set to 'false'!");
-        }
-    }
-
-    /**
-     * Sends the reply to Discord, taking into account all the settings that were previously made to this context.
-     */
-    public void queue() {
-        if (editReply) {
-            queueEdit();
-        } else {
-            queueReply();
-        }
-    }
-
-    private void queueEdit() {
-        IMessageEditCallback callback;
-        if (event instanceof IMessageEditCallback) {
-            callback = (IMessageEditCallback) event;
-        } else {
-            queueReply();
-            return;
-        }
-        if (event instanceof ModalInteractionEvent) {
-            if (((ModalInteractionEvent) event).getMessage() == null) {
-                queueReply();
-                return;
-            }
-        }
-        if (!event.isAcknowledged()) {
-            callback.deferEdit().queue();
-        }
-        callback.getHook().editOriginal(toMessageEditData()).queue(success, failure);
-    }
-
-    private void queueReply() {
-        IReplyCallback callback;
-        if (event instanceof IReplyCallback) {
-            callback = (IReplyCallback) event;
-        } else {
-            throw new IllegalArgumentException(
-                    String.format("Cannot reply to '%s'! Please report this error to the jda-commands devs!", event.getClass().getName())
-            );
-        }
-        if (!event.isAcknowledged()) {
-            callback.deferReply(ephemeralReply).queue();
-        }
-        callback.getHook().sendMessage(toMessageCreateData()).queue(success, failure);
-    }
-}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/Replyable.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/Replyable.java
deleted file mode 100644
index 1faa089bd..000000000
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/Replyable.java
+++ /dev/null
@@ -1,347 +0,0 @@
-package com.github.kaktushose.jda.commands.dispatching.reply;
-
-import com.github.kaktushose.jda.commands.annotations.interactions.SlashCommand;
-import com.github.kaktushose.jda.commands.data.EmbedDTO;
-import com.github.kaktushose.jda.commands.dispatching.KeyValueStore;
-import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
-import com.github.kaktushose.jda.commands.dispatching.interactions.GenericEvent;
-import com.github.kaktushose.jda.commands.dispatching.reply.components.Buttons;
-import com.github.kaktushose.jda.commands.dispatching.reply.components.Component;
-import com.github.kaktushose.jda.commands.dispatching.reply.components.SelectMenus;
-import net.dv8tion.jda.api.EmbedBuilder;
-import net.dv8tion.jda.api.entities.Message;
-import net.dv8tion.jda.api.interactions.components.ActionRow;
-import net.dv8tion.jda.api.interactions.components.ItemComponent;
-import net.dv8tion.jda.api.interactions.components.buttons.Button;
-import net.dv8tion.jda.api.utils.messages.MessageCreateData;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.function.Consumer;
-
-/**
- * Generic interface holding reply methods.
- *
- * @since 2.3.0
- */
-public interface Replyable {
-
-    Logger log = LoggerFactory.getLogger(GenericEvent.class);
-
-    /**
-     * Sends a message to the TextChannel where the interaction was executed.
-     *
-     * @param message the message to send
-     */
-    default void reply(@NotNull String message) {
-        getReplyContext().getBuilder().setContent(message);
-        reply();
-    }
-
-    /**
-     * Sends a formatted message using the specified format string and arguments to the TextChannel where the interaction was executed.
-     *
-     * @param format the message to send
-     * @param args   Arguments referenced by the format specifiers in the format string. If there are more arguments than
-     *               format specifiers, the extra arguments are ignored. The number of arguments is variable and may be
-     *               zero.
-     * @throws java.util.IllegalFormatException If a format string contains an illegal syntax, a format specifier that
-     *                                          is incompatible with the given arguments, insufficient arguments given
-     *                                          the format string, or other illegal conditions.
-     */
-    default void reply(@NotNull String format, @NotNull Object... args) {
-        getReplyContext().getBuilder().setContent(String.format(format, args));
-        reply();
-    }
-
-    /**
-     * Sends a message to the TextChannel where the interaction was executed.
-     *
-     * @param message the {@code Message} to send
-     */
-    default void reply(@NotNull MessageCreateData message) {
-        getReplyContext().getBuilder().applyData(message);
-        reply();
-    }
-
-    /**
-     * Sends a message to the TextChannel where the interaction was executed.
-     *
-     * @param builder the {@code EmbedBuilder} to send
-     */
-    default void reply(@NotNull EmbedBuilder builder) {
-        getReplyContext().getBuilder().setEmbeds(builder.build());
-        reply();
-    }
-
-    /**
-     * Sends a message to the TextChannel where the interaction was executed.
-     *
-     * @param embedDTO the {@link EmbedDTO} to send
-     */
-    default void reply(@NotNull EmbedDTO embedDTO) {
-        getReplyContext().getBuilder().setEmbeds(embedDTO.toMessageEmbed());
-        reply();
-    }
-
-    /**
-     * Sends a message to the TextChannel where the interaction was executed. This method also allows to access the JDA RestAction
-     * consumer.
-     *
-     * @param message the {@link String} message to send
-     * @param success the JDA RestAction success consumer
-     * @see <a href="https://ci.dv8tion.net/job/JDA/javadoc/net/dv8tion/jda/api/requests/RestAction.html">JDA RestAction Documentation</a>
-     */
-    default void reply(@NotNull String message, @Nullable Consumer<Message> success) {
-        getReplyContext().getBuilder().setContent(message);
-        setSuccessCallback(success);
-        reply();
-    }
-
-    /**
-     * Sends a message to the TextChannel where the interaction was executed. This method also allows to access the JDA RestAction
-     * consumer.
-     *
-     * @param message the {@link Message} to send
-     * @param success the JDA RestAction success consumer
-     * @see <a href="https://ci.dv8tion.net/job/JDA/javadoc/net/dv8tion/jda/api/requests/RestAction.html">JDA RestAction Documentation</a>
-     */
-    default void reply(@NotNull MessageCreateData message, @Nullable Consumer<Message> success) {
-        getReplyContext().getBuilder().applyData(message);
-        setSuccessCallback(success);
-        reply();
-    }
-
-    /**
-     * Sends a message to the TextChannel where the interaction was executed. This method also allows to access the JDA RestAction
-     * consumer.
-     *
-     * @param builder the {@link EmbedBuilder} to send
-     * @param success the JDA RestAction success consumer
-     * @see <a href="https://ci.dv8tion.net/job/JDA/javadoc/net/dv8tion/jda/api/requests/RestAction.html">JDA RestAction Documentation</a>
-     */
-    default void reply(@NotNull EmbedBuilder builder, @Nullable Consumer<Message> success) {
-        getReplyContext().getBuilder().setEmbeds(builder.build());
-        setSuccessCallback(success);
-        reply();
-    }
-
-    /**
-     * Sends a message to the TextChannel where the interaction was executed. This method also allows to access the JDA RestAction
-     * consumer.
-     *
-     * @param embedDTO the {@link EmbedDTO} to send
-     * @param success  the JDA RestAction success consumer
-     * @see <a href="https://ci.dv8tion.net/job/JDA/javadoc/net/dv8tion/jda/api/requests/RestAction.html">JDA RestAction Documentation</a>
-     */
-    default void reply(@NotNull EmbedDTO embedDTO, @Nullable Consumer<Message> success) {
-        getReplyContext().getBuilder().setEmbeds(embedDTO.toMessageEmbed());
-        setSuccessCallback(success);
-        reply();
-    }
-
-    /**
-     * Adds an {@link ActionRow} to the reply and adds the passed {@link Component Components} to it.
-     * For buttonContainers, they must be defined in the same
-     * {@link com.github.kaktushose.jda.commands.annotations.interactions.Interaction Interaction} as the referring
-     * {@link SlashCommand Command}.
-     *
-     * @param components the {@link Component Components} to add
-     * @return the current instance for fluent interface
-     */
-    default Replyable with(@NotNull Component... components) {
-        List<ItemComponent> items = new ArrayList<>();
-        Context context = getContext();
-        for (Component component : components) {
-            if (component instanceof Buttons) {
-                Buttons buttons = (Buttons) component;
-                buttons.buttonContainers().forEach(container -> {
-                    String id = String.format("%s%s", context.getInteractionDefinition().getMethod().getDeclaringClass().getSimpleName(), container.name());
-                    context.getInteractionRegistry().getButtons()
-                            .stream()
-                            .filter(it -> it.getDefinitionId().equals(id))
-                            .findFirst()
-                            .map(it -> {
-                                Button jdaButton = it.toButton().withDisabled(!container.enabled());
-                                //only assign ids to non-link buttonContainers
-                                if (jdaButton.getUrl() == null) {
-                                    jdaButton = jdaButton.withId(it.createCustomId(context.getRuntime().getRuntimeId()));
-                                }
-                                return jdaButton;
-                            }).ifPresent(items::add);
-                });
-            }
-            if (component instanceof SelectMenus) {
-                SelectMenus menus = (SelectMenus) component;
-                menus.selectMenuContainers().forEach(container -> {
-                    String id = String.format("%s%s", context.getInteractionDefinition().getMethod().getDeclaringClass().getSimpleName(), container.getName());
-                    context.getInteractionRegistry().getSelectMenus()
-                            .stream()
-                            .filter(it -> it.getDefinitionId().equals(id))
-                            .findFirst().map(it -> it.toSelectMenu(context.getRuntime().getRuntimeId(), container.isEnabled()))
-                            .ifPresent(items::add);
-                });
-            }
-        }
-
-        if (!items.isEmpty()) {
-            getReplyContext().getBuilder().addComponents(ActionRow.of(items));
-        }
-        return this;
-    }
-
-    /**
-     * Get the {@link Context} object.
-     *
-     * @return the registered {@link Context} object
-     */
-    Context getContext();
-
-    /**
-     * Gets the {@link KeyValueStore} that is bound to this execution.
-     *
-     * @return the {@link KeyValueStore} bound to this execution
-     */
-    default KeyValueStore kv() {
-        return getContext().getKeyValueStore();
-    }
-
-    /**
-     * Adds an {@link ActionRow} to the reply and adds the passed {@link Component Components} to it.
-     * The buttonContainers must be defined in the same
-     * {@link com.github.kaktushose.jda.commands.annotations.interactions.Interaction Interaction} as the referring
-     * {@link SlashCommand Command}. This will enable all buttonContainers. To add
-     * disabled buttonContainers, use {@link #with(Component...)}.
-     *
-     * @param buttons the id of the buttonContainers to add
-     * @return the current instance for fluent interface
-     */
-    default Replyable withButtons(@NotNull String... buttons) {
-        with(Buttons.enabled(buttons));
-        return this;
-    }
-
-    /**
-     * Adds an {@link ActionRow} to the reply and adds the passed {@link Component Components} to it.
-     * The select menus must be defined in the same
-     * {@link com.github.kaktushose.jda.commands.annotations.interactions.Interaction Interaction} as the referring
-     * {@link SlashCommand Command}. This will enable all select menus. To add
-     * disabled select menus, use {@link #with(Component...)}.
-     *
-     * @param selectMenus the id of the selectMenus to add
-     * @return the current instance for fluent interface
-     */
-    default Replyable withSelectMenus(@NotNull String... selectMenus) {
-        with(SelectMenus.enabled(selectMenus));
-        return this;
-    }
-
-    /**
-     * Whether to send ephemeral replies.
-     *
-     * @param ephemeral {@code true} if replies should be ephemeral
-     * @return the current instance for fluent interface
-     */
-    default Replyable setEphemeral(boolean ephemeral) {
-        getReplyContext().setEphemeralReply(ephemeral);
-        return this;
-    }
-
-    /**
-     * Sets the success callback consumer.
-     *
-     * @param success the callback consumer
-     * @return the current instance for fluent interface
-     */
-    default Replyable setSuccessCallback(Consumer<Message> success) {
-        getReplyContext().setSuccessCallback(success);
-        return this;
-    }
-
-    /**
-     * Sets the failure callback consumer.
-     *
-     * @param failure the callback consumer
-     * @return the current instance for fluent interface
-     */
-    default Replyable setFailureCallback(Consumer<Throwable> failure) {
-        getReplyContext().setFailureCallback(failure);
-        return this;
-    }
-
-    /**
-     * Whether this reply should edit the existing message or send a new one. The default value is
-     * {@code true}.
-     *
-     * @param edit {@code true} if this reply should edit the existing message
-     * @return the current instance for fluent interface
-     */
-    default Replyable editReply(boolean edit) {
-        getReplyContext().setEditReply(edit);
-        return this;
-    }
-
-    /**
-     * Whether this reply should keep all components that are attached to the previous message. The default value is
-     * {@code true}.
-     *
-     * @param keep {@code true} if this reply should keep all components
-     * @return the current instance for fluent interface
-     */
-    default Replyable keepComponents(boolean keep) {
-        getReplyContext().setKeepComponents(keep);
-        return this;
-    }
-
-    /**
-     * Sends the reply to Discord. Use this if you only want to edit components or if you have constructed the reply
-     * message by using {@link #getReplyContext()}. This method also allows to access the JDA RestAction
-     * consumer.
-     *
-     * @param success the JDA RestAction success consumer
-     */
-    default void reply(Consumer<Message> success) {
-        setSuccessCallback(success);
-        reply();
-    }
-
-    /**
-     * Sends the reply to Discord. Use this if you only want to edit components or if you have constructed the reply
-     * message by using {@link #getReplyContext()}. This method also allows to access the JDA RestAction
-     * consumer.
-     *
-     * @param success the JDA RestAction success consumer
-     * @param failure the JDA RestAction failure consumer
-     */
-    default void reply(Consumer<Message> success, Consumer<Throwable> failure) {
-        setSuccessCallback(success);
-        setFailureCallback(failure);
-        reply();
-    }
-
-    /**
-     * Removes all components from the last message that was sent. <b>This will only work with
-     * {@link #editReply(boolean)} set to true.</b>
-     */
-    default void removeComponents() {
-        getReplyContext().removeComponents();
-    }
-
-    /**
-     * Sends the reply to Discord. Use this if you only want to edit components or if you have constructed the reply
-     * message by using {@link #getReplyContext()}.
-     */
-    void reply();
-
-    /**
-     * Gets the {@link ReplyContext} to use.
-     *
-     * @return the {@link ReplyContext}
-     */
-    ReplyContext getReplyContext();
-
-}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/components/Buttons.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/components/Buttons.java
deleted file mode 100644
index ddc8e0be0..000000000
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/components/Buttons.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.github.kaktushose.jda.commands.dispatching.reply.components;
-
-import com.github.kaktushose.jda.commands.dispatching.reply.Replyable;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-
-/**
- * {@link Component} implementation for buttonContainers. This class can be used to add
- * {@link com.github.kaktushose.jda.commands.annotations.interactions.Button Buttons} to messages while defining their
- * state (enabled or disabled).
- *
- * @see Replyable#with(Component...)
- * @since 2.3.0
- */
-public record Buttons(Collection<ButtonContainer> buttonContainers) implements Component {
-
-    public Buttons(Collection<ButtonContainer> buttonContainers) {
-        this.buttonContainers = Collections.unmodifiableCollection(buttonContainers);
-    }
-
-    /**
-     * Add the buttonContainers with the given ids to the reply message as enabled.
-     *
-     * @param buttons the id of the buttonContainers to add
-     * @return instance of this class used inside the
-     * {@link com.github.kaktushose.jda.commands.dispatching.reply.ReplyContext}
-     */
-    public static Buttons enabled(String... buttons) {
-        return build(true, buttons);
-    }
-
-    /**
-     * Add the buttonContainers with the given ids to the reply message as disabled.
-     *
-     * @param buttons the id of the buttonContainers to add
-     * @return instance of this class used inside the
-     * {@link com.github.kaktushose.jda.commands.dispatching.reply.ReplyContext}
-     */
-    public static Buttons disabled(String... buttons) {
-        return build(false, buttons);
-    }
-
-    private static Buttons build(boolean enabled, String... buttons) {
-        List<ButtonContainer> result = new ArrayList<>();
-        for (String button : buttons) {
-            result.add(new ButtonContainer(button, enabled));
-        }
-        return new Buttons(result);
-    }
-
-    /**
-     * Contains information about a single {@link com.github.kaktushose.jda.commands.annotations.interactions.Button Button}.
-     */
-    public record ButtonContainer(String name, boolean enabled) {
-    }
-}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/components/Component.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/components/Component.java
deleted file mode 100644
index 3e8ec4c33..000000000
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/components/Component.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.github.kaktushose.jda.commands.dispatching.reply.components;
-
-import com.github.kaktushose.jda.commands.dispatching.reply.Replyable;
-
-/**
- * Marker interface for components that can be added to messages.
- *
- * @see Replyable#with(Component...) ReplyAction#with(Component...)
- * @see Buttons
- * @see SelectMenus
- * @since 2.3.0
- */
-public sealed interface Component permits Buttons, SelectMenus {
-}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/components/SelectMenus.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/components/SelectMenus.java
deleted file mode 100644
index 1ffac30c4..000000000
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/components/SelectMenus.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package com.github.kaktushose.jda.commands.dispatching.reply.components;
-
-import com.github.kaktushose.jda.commands.dispatching.reply.Replyable;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-
-/**
- * {@link Component} implementation for select menus. This class can be used to add
- * {@link com.github.kaktushose.jda.commands.annotations.interactions.StringSelectMenu StringSelectMenus} or
- * {@link com.github.kaktushose.jda.commands.annotations.interactions.EntitySelectMenu EntitySelectMenus}
- * to messages while defining their state (enabled or disabled).
- *
- * @see Replyable#with(Component...)
- * @since 2.3.0
- */
-public record SelectMenus(Collection<SelectMenus.SelectMenuContainer> selectMenuContainers) implements Component {
-
-    public SelectMenus(Collection<SelectMenus.SelectMenuContainer> selectMenuContainers) {
-        this.selectMenuContainers = Collections.unmodifiableCollection(selectMenuContainers);
-    }
-
-    /**
-     * Add the select menus with the given ids to the reply message as enabled.
-     *
-     * @param menus the id of the select menus to add
-     * @return instance of this class used inside the
-     * {@link com.github.kaktushose.jda.commands.dispatching.reply.ReplyContext}
-     */
-    public static SelectMenus enabled(String... menus) {
-        return build(true, menus);
-    }
-
-    /**
-     * Add the  select menus with the given ids to the reply message as disabled.
-     *
-     * @param menus the id of the select menus to add
-     * @return instance of this class used inside the
-     * {@link com.github.kaktushose.jda.commands.dispatching.reply.ReplyContext}
-     */
-    public static SelectMenus disabled(String... menus) {
-        return build(false, menus);
-    }
-
-    private static SelectMenus build(boolean enabled, String... menus) {
-        List<SelectMenus.SelectMenuContainer> result = new ArrayList<>();
-        for (String menu : menus) {
-            result.add(new SelectMenus.SelectMenuContainer(menu, enabled));
-        }
-        return new SelectMenus(result);
-    }
-
-    /**
-     * Contains information about a single select menu (either StringSelectMenu or EntitySelectMenu).
-     */
-    public static class SelectMenuContainer {
-        private final String name;
-        private final boolean enabled;
-
-        private SelectMenuContainer(String name, boolean enabled) {
-            this.name = name;
-            this.enabled = enabled;
-        }
-
-        /**
-         * Gets the button id.
-         *
-         * @return the button id
-         */
-        public String getName() {
-            return name;
-        }
-
-        /**
-         * Whether the button is enabled or not.
-         *
-         * @return {@code true} if the button is enabled
-         */
-        public boolean isEnabled() {
-            return enabled;
-        }
-    }
-}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/components/package-info.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/components/package-info.java
deleted file mode 100644
index dd7a87984..000000000
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/components/package-info.java
+++ /dev/null
@@ -1,4 +0,0 @@
-/**
- * Components that can be added to messages.
- */
-package com.github.kaktushose.jda.commands.dispatching.reply.components;
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/Validator.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/Validator.java
index 7734c2a5f..0ff78da04 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/Validator.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/Validator.java
@@ -1,6 +1,6 @@
 package com.github.kaktushose.jda.commands.dispatching.validation;
 
-import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
+import com.github.kaktushose.jda.commands.dispatching.context.InvocationContext;
 import org.jetbrains.annotations.NotNull;
 
 /**
@@ -18,9 +18,9 @@ public interface Validator {
      *
      * @param argument   the argument to validate
      * @param annotation the corresponding annotation
-     * @param context    the corresponding {@link Context}
+     * @param context    the corresponding {@link InvocationContext}
      * @return {@code true} if the argument passes the constraints
      */
-    boolean apply(@NotNull Object argument, @NotNull Object annotation, @NotNull Context context);
+    boolean apply(@NotNull Object argument, @NotNull Object annotation, @NotNull InvocationContext<?> context);
 
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/MaximumValidator.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/MaximumValidator.java
index 6e7902469..aa7db9d91 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/MaximumValidator.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/MaximumValidator.java
@@ -1,7 +1,7 @@
 package com.github.kaktushose.jda.commands.dispatching.validation.impl;
 
 import com.github.kaktushose.jda.commands.annotations.constraints.Max;
-import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
+import com.github.kaktushose.jda.commands.dispatching.context.InvocationContext;
 import com.github.kaktushose.jda.commands.dispatching.validation.Validator;
 import org.jetbrains.annotations.NotNull;
 
@@ -18,11 +18,11 @@ public class MaximumValidator implements Validator {
      *
      * @param argument   the argument to validate
      * @param annotation the corresponding annotation
-     * @param context    the corresponding {@link Context}
+     * @param context    the corresponding {@link InvocationContext}
      * @return {@code true} if the argument is a number whose value is lower or equal to the specified maximum
      */
     @Override
-    public boolean apply(@NotNull Object argument, @NotNull Object annotation, @NotNull Context context) {
+    public boolean apply(@NotNull Object argument, @NotNull Object annotation, @NotNull InvocationContext<?> context) {
         Max max = (Max) annotation;
         return ((Number) argument).longValue() <= max.value();
     }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/MinimumValidator.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/MinimumValidator.java
index 2f7982bb3..65146f562 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/MinimumValidator.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/MinimumValidator.java
@@ -1,7 +1,7 @@
 package com.github.kaktushose.jda.commands.dispatching.validation.impl;
 
 import com.github.kaktushose.jda.commands.annotations.constraints.Min;
-import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
+import com.github.kaktushose.jda.commands.dispatching.context.InvocationContext;
 import com.github.kaktushose.jda.commands.dispatching.validation.Validator;
 import org.jetbrains.annotations.NotNull;
 
@@ -19,11 +19,11 @@ public class MinimumValidator implements Validator {
      *
      * @param argument   the argument to validate
      * @param annotation the corresponding annotation
-     * @param context    the corresponding {@link Context}
+     * @param context    the corresponding {@link InvocationContext}
      * @return {@code true} if the argument is a number whose value is greater or equal to the specified minimum
      */
     @Override
-    public boolean apply(@NotNull Object argument, @NotNull Object annotation, @NotNull Context context) {
+    public boolean apply(@NotNull Object argument, @NotNull Object annotation, @NotNull InvocationContext<?> context) {
         Min min = (Min) annotation;
         return ((Number) argument).longValue() >= min.value();
     }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/NotPermissionValidator.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/NotPermissionValidator.java
index 541b0236e..fceaa5518 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/NotPermissionValidator.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/NotPermissionValidator.java
@@ -1,7 +1,7 @@
 package com.github.kaktushose.jda.commands.dispatching.validation.impl;
 
 import com.github.kaktushose.jda.commands.annotations.constraints.NotPerm;
-import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
+import com.github.kaktushose.jda.commands.dispatching.context.InvocationContext;
 import com.github.kaktushose.jda.commands.dispatching.validation.Validator;
 import net.dv8tion.jda.api.Permission;
 import net.dv8tion.jda.api.entities.Member;
@@ -24,12 +24,12 @@ public class NotPermissionValidator implements Validator {
      *
      * @param argument   the argument to validate
      * @param annotation the corresponding annotation
-     * @param context    the corresponding {@link Context}
+     * @param context    the corresponding {@link InvocationContext}
      * @return {@code true} if the argument is a user or member that <b>doesn't</b> have the specified discord
      * permission
      */
     @Override
-    public boolean apply(@NotNull Object argument, @NotNull Object annotation, @NotNull Context context) {
+    public boolean apply(@NotNull Object argument, @NotNull Object annotation, @NotNull InvocationContext<?> context) {
         Set<Permission> permissions = new HashSet<>();
         NotPerm perm = (NotPerm) annotation;
 
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/NotRoleValidator.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/NotRoleValidator.java
index 635f57d8a..cc2d53b3d 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/NotRoleValidator.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/NotRoleValidator.java
@@ -2,7 +2,7 @@
 
 import com.github.kaktushose.jda.commands.annotations.constraints.NotRole;
 import com.github.kaktushose.jda.commands.dispatching.adapter.impl.RoleAdapter;
-import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
+import com.github.kaktushose.jda.commands.dispatching.context.InvocationContext;
 import com.github.kaktushose.jda.commands.dispatching.validation.Validator;
 import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.Role;
@@ -23,14 +23,14 @@ public class NotRoleValidator implements Validator {
      *
      * @param argument   the argument to validate
      * @param annotation the corresponding annotation
-     * @param context    the corresponding {@link Context}
+     * @param context    the corresponding {@link InvocationContext}
      * @return {@code true} if the argument is a user or member that <b>doesn't</b> have the specified guild role
      */
     @Override
-    public boolean apply(@NotNull Object argument, @NotNull Object annotation, @NotNull Context context) {
+    public boolean apply(@NotNull Object argument, @NotNull Object annotation, @NotNull InvocationContext<?> context) {
         NotRole roleAnnotation = (NotRole) annotation;
 
-        Optional<Role> optional = new RoleAdapter().apply(roleAnnotation.value(), context);
+        Optional<Role> optional = new RoleAdapter().apply(roleAnnotation.value(), context.event());
         Member member = (Member) argument;
 
         return optional.filter(role -> member.getRoles().contains(role)).isEmpty();
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/NotUserValidator.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/NotUserValidator.java
index 8f10a0af9..b26acaee2 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/NotUserValidator.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/NotUserValidator.java
@@ -2,7 +2,7 @@
 
 import com.github.kaktushose.jda.commands.annotations.constraints.NotUser;
 import com.github.kaktushose.jda.commands.dispatching.adapter.impl.MemberAdapter;
-import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
+import com.github.kaktushose.jda.commands.dispatching.context.InvocationContext;
 import com.github.kaktushose.jda.commands.dispatching.validation.Validator;
 import net.dv8tion.jda.api.entities.Member;
 import org.jetbrains.annotations.NotNull;
@@ -22,14 +22,14 @@ public class NotUserValidator implements Validator {
      *
      * @param argument   the argument to validate
      * @param annotation the corresponding annotation
-     * @param context    the corresponding {@link Context}
+     * @param context    the corresponding {@link InvocationContext}
      * @return {@code true} if the argument <b>isn't</b> the specified user or member
      */
     @Override
-    public boolean apply(@NotNull Object argument, @NotNull Object annotation, @NotNull Context context) {
+    public boolean apply(@NotNull Object argument, @NotNull Object annotation, @NotNull InvocationContext<?> context) {
         Member member = (Member) argument;
         NotUser user = (NotUser) annotation;
-        Optional<Member> optional = new MemberAdapter().apply(user.value(), context);
+        Optional<Member> optional = new MemberAdapter().apply(user.value(), context.event());
         return optional.filter(member::equals).isEmpty();
     }
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/PermissionValidator.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/PermissionValidator.java
index b2bdef7ac..906d1b0c6 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/PermissionValidator.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/PermissionValidator.java
@@ -1,7 +1,7 @@
 package com.github.kaktushose.jda.commands.dispatching.validation.impl;
 
 import com.github.kaktushose.jda.commands.annotations.constraints.Perm;
-import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
+import com.github.kaktushose.jda.commands.dispatching.context.InvocationContext;
 import com.github.kaktushose.jda.commands.dispatching.validation.Validator;
 import net.dv8tion.jda.api.Permission;
 import net.dv8tion.jda.api.entities.Member;
@@ -24,12 +24,12 @@ public class PermissionValidator implements Validator {
      *
      * @param argument   the argument to validate
      * @param annotation the corresponding annotation
-     * @param context    the corresponding {@link Context}
+     * @param context    the corresponding {@link InvocationContext}
      * @return {@code true} if the argument is a user or member that has the specified discord
      * permission
      */
     @Override
-    public boolean apply(@NotNull Object argument, @NotNull Object annotation, @NotNull Context context) {
+    public boolean apply(@NotNull Object argument, @NotNull Object annotation, @NotNull InvocationContext<?> context) {
         Set<Permission> permissions = new HashSet<>();
         Perm perm = (Perm) annotation;
         try {
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/RoleValidator.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/RoleValidator.java
index 517bdac63..d18c74cc8 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/RoleValidator.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/RoleValidator.java
@@ -1,7 +1,7 @@
 package com.github.kaktushose.jda.commands.dispatching.validation.impl;
 
 import com.github.kaktushose.jda.commands.dispatching.adapter.impl.RoleAdapter;
-import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
+import com.github.kaktushose.jda.commands.dispatching.context.InvocationContext;
 import com.github.kaktushose.jda.commands.dispatching.validation.Validator;
 import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.Role;
@@ -23,15 +23,15 @@ public class RoleValidator implements Validator {
      *
      * @param argument   the argument to validate
      * @param annotation the corresponding annotation
-     * @param context    the corresponding {@link Context}
+     * @param context    the corresponding {@link InvocationContext}
      * @return {@code true} if the argument is a user or member that has the specified guild role
      */
     @Override
-    public boolean apply(@NotNull Object argument, @NotNull Object annotation, @NotNull Context context) {
+    public boolean apply(@NotNull Object argument, @NotNull Object annotation, @NotNull InvocationContext<?> context) {
         com.github.kaktushose.jda.commands.annotations.constraints.Role roleAnnotation =
                 (com.github.kaktushose.jda.commands.annotations.constraints.Role) annotation;
 
-        Optional<Role> optional = new RoleAdapter().apply(roleAnnotation.value(), context);
+        Optional<Role> optional = new RoleAdapter().apply(roleAnnotation.value(), context.event());
         Member member = (Member) argument;
 
         return optional.filter(role -> member.getRoles().contains(role)).isPresent();
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/UserValidator.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/UserValidator.java
index 2df8a190e..7976bc50a 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/UserValidator.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/UserValidator.java
@@ -2,7 +2,7 @@
 
 import com.github.kaktushose.jda.commands.annotations.constraints.User;
 import com.github.kaktushose.jda.commands.dispatching.adapter.impl.MemberAdapter;
-import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
+import com.github.kaktushose.jda.commands.dispatching.context.InvocationContext;
 import com.github.kaktushose.jda.commands.dispatching.validation.Validator;
 import net.dv8tion.jda.api.entities.Member;
 import org.jetbrains.annotations.NotNull;
@@ -22,14 +22,14 @@ public class UserValidator implements Validator {
      *
      * @param argument   the argument to validate
      * @param annotation the corresponding annotation
-     * @param context    the corresponding {@link Context}
+     * @param context    the corresponding {@link InvocationContext}
      * @return {@code true} if the argument is the specified user or member
      */
     @Override
-    public boolean apply(@NotNull Object argument, @NotNull Object annotation, @NotNull Context context) {
+    public boolean apply(@NotNull Object argument, @NotNull Object annotation, @NotNull InvocationContext<?> context) {
         Member member = (Member) argument;
         User user = (User) annotation;
-        Optional<Member> optional = new MemberAdapter().apply(user.value(), context);
+        Optional<Member> optional = new MemberAdapter().apply(user.value(), context.event());
         return optional.filter(member::equals).isPresent();
     }
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/data/EmbedCache.java b/src/main/java/com/github/kaktushose/jda/commands/embeds/EmbedCache.java
similarity index 98%
rename from src/main/java/com/github/kaktushose/jda/commands/data/EmbedCache.java
rename to src/main/java/com/github/kaktushose/jda/commands/embeds/EmbedCache.java
index 34c769c34..bdccce0be 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/data/EmbedCache.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/embeds/EmbedCache.java
@@ -1,4 +1,4 @@
-package com.github.kaktushose.jda.commands.data;
+package com.github.kaktushose.jda.commands.embeds;
 
 import com.google.gson.Gson;
 import com.google.gson.JsonIOException;
diff --git a/src/main/java/com/github/kaktushose/jda/commands/data/EmbedDTO.java b/src/main/java/com/github/kaktushose/jda/commands/embeds/EmbedDTO.java
similarity index 98%
rename from src/main/java/com/github/kaktushose/jda/commands/data/EmbedDTO.java
rename to src/main/java/com/github/kaktushose/jda/commands/embeds/EmbedDTO.java
index f4b561366..a48aad66b 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/data/EmbedDTO.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/embeds/EmbedDTO.java
@@ -1,4 +1,4 @@
-package com.github.kaktushose.jda.commands.data;
+package com.github.kaktushose.jda.commands.embeds;
 
 import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.entities.MessageEmbed;
@@ -6,6 +6,7 @@
 import net.dv8tion.jda.api.utils.messages.MessageCreateData;
 
 import java.awt.*;
+import java.io.Serial;
 import java.io.Serializable;
 import java.time.ZonedDateTime;
 import java.util.Arrays;
@@ -14,7 +15,7 @@
 import java.util.regex.Pattern;
 
 /**
- * This class is a DTO to serialize and deserialize JDA's embed objects to json. Checkout the discord docs to get
+ * This class is a DTO to serialize and deserialize JDAs embed objects to json. Checkout the discord docs to get
  * information about what each field does exactly.
  *
  * <p>The json object can contain {@code {placeholders}} which can then be injected with values at runtime by calling
@@ -27,6 +28,7 @@
  */
 public class EmbedDTO implements Serializable {
 
+    @Serial
     private static final long serialVersionUID = 0L;
     private String title;
     private String description;
diff --git a/src/main/java/com/github/kaktushose/jda/commands/embeds/ErrorMessageFactory.java b/src/main/java/com/github/kaktushose/jda/commands/embeds/ErrorMessageFactory.java
deleted file mode 100644
index ea3e7cae8..000000000
--- a/src/main/java/com/github/kaktushose/jda/commands/embeds/ErrorMessageFactory.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package com.github.kaktushose.jda.commands.embeds;
-
-import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
-import com.github.kaktushose.jda.commands.dispatching.interactions.commands.SlashCommandContext;
-import com.github.kaktushose.jda.commands.reflect.ConstraintDefinition;
-import net.dv8tion.jda.api.entities.Message;
-import net.dv8tion.jda.api.utils.messages.MessageCreateData;
-import org.jetbrains.annotations.NotNull;
-
-/**
- * Generic interface for factory classes that generate error messages.
- *
- * @see com.github.kaktushose.jda.commands.annotations.Implementation
- * @see DefaultErrorMessageFactory
- * @since 2.0.0
- */
-public interface ErrorMessageFactory {
-
-    /**
-     * Gets a {@link MessageCreateData} to send when type adapting of the user input failed.
-     *
-     * @param context the corresponding {@link SlashCommandContext}
-     * @return a {@link MessageCreateData} to send when type adapting failed
-     */
-    MessageCreateData getTypeAdaptingFailedMessage(@NotNull SlashCommandContext context);
-
-    /**
-     * Gets a {@link MessageCreateData} to send when a user is missing permissions.
-     *
-     * @param context the corresponding {@link Context}
-     * @return a {@link MessageCreateData} to send when a user is missing permissions
-     */
-    MessageCreateData getInsufficientPermissionsMessage(@NotNull Context context);
-
-    /**
-     * Gets a {@link MessageCreateData} to send when a parameter constraint fails.
-     *
-     * @param context    the corresponding {@link Context}
-     * @param constraint the corresponding {@link ConstraintDefinition} that failed
-     * @return a {@link MessageCreateData} to send when a parameter constraint fails
-     */
-    MessageCreateData getConstraintFailedMessage(@NotNull Context context, @NotNull ConstraintDefinition constraint);
-
-    /**
-     * Gets a {@link Message} to send when a command still has a cooldown.
-     *
-     * @param context the corresponding {@link Context}
-     * @return a {@link MessageCreateData} to send when a command still has a cooldown
-     */
-    MessageCreateData getCooldownMessage(@NotNull Context context, long ms);
-
-    /**
-     * Gets a {@link MessageCreateData} to send when the channel type isn't suitable for the command.
-     *
-     * @param context the corresponding {@link Context}
-     * @return a {@link MessageCreateData} to send when the channel type isn't suitable for the command
-     */
-    MessageCreateData getWrongChannelTypeMessage(@NotNull Context context);
-
-    /**
-     * Gets a {@link MessageCreateData} to send when the command execution failed.
-     *
-     * @param context   the corresponding {@link Context}
-     * @param exception the Exception that made the command execution fail
-     * @return a {@link MessageCreateData} to send when the command execution failed
-     */
-    MessageCreateData getCommandExecutionFailedMessage(@NotNull Context context, @NotNull Throwable exception);
-
-    /**
-     * Gets a {@link MessageCreateData} to send when an incoming interaction already timed out.
-     *
-     * @param context the corresponding {@link Context}
-     * @return a {@link MessageCreateData} to send when an incoming interaction already timed out
-     */
-    MessageCreateData getUnknownInteractionMessage(@NotNull Context context);
-
-}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/embeds/DefaultErrorMessageFactory.java b/src/main/java/com/github/kaktushose/jda/commands/embeds/error/DefaultErrorMessageFactory.java
similarity index 82%
rename from src/main/java/com/github/kaktushose/jda/commands/embeds/DefaultErrorMessageFactory.java
rename to src/main/java/com/github/kaktushose/jda/commands/embeds/error/DefaultErrorMessageFactory.java
index feed5a152..39033ac18 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/embeds/DefaultErrorMessageFactory.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/embeds/error/DefaultErrorMessageFactory.java
@@ -1,20 +1,18 @@
-package com.github.kaktushose.jda.commands.embeds;
+package com.github.kaktushose.jda.commands.embeds.error;
 
-import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
-import com.github.kaktushose.jda.commands.dispatching.interactions.commands.CommandEvent;
-import com.github.kaktushose.jda.commands.dispatching.interactions.commands.SlashCommandContext;
+import com.github.kaktushose.jda.commands.dispatching.events.interactions.CommandEvent;
 import com.github.kaktushose.jda.commands.reflect.ConstraintDefinition;
 import com.github.kaktushose.jda.commands.reflect.interactions.GenericInteractionDefinition;
 import com.github.kaktushose.jda.commands.reflect.interactions.commands.SlashCommandDefinition;
 import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.entities.MessageEmbed;
+import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent;
 import net.dv8tion.jda.api.utils.messages.MessageCreateBuilder;
 import net.dv8tion.jda.api.utils.messages.MessageCreateData;
 import org.jetbrains.annotations.NotNull;
 
 import java.awt.*;
 import java.text.SimpleDateFormat;
-import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
@@ -26,11 +24,13 @@
  */
 public class DefaultErrorMessageFactory implements ErrorMessageFactory {
 
+    @NotNull
     @Override
-    public MessageCreateData getTypeAdaptingFailedMessage(@NotNull SlashCommandContext context) {
+    public MessageCreateData getTypeAdaptingFailedMessage(@NotNull GenericInteractionCreateEvent event,
+                                                          @NotNull GenericInteractionDefinition definition,
+                                                          @NotNull List<String> userInput) {
         StringBuilder sbExpected = new StringBuilder();
-        SlashCommandDefinition command = context.getCommand();
-        List<String> arguments = Arrays.asList(context.getInput());
+        SlashCommandDefinition command = (SlashCommandDefinition) definition;
 
         command.getParameters().forEach(parameter -> {
             if (CommandEvent.class.isAssignableFrom(parameter.type())) {
@@ -45,7 +45,7 @@ public MessageCreateData getTypeAdaptingFailedMessage(@NotNull SlashCommandConte
         String expected = sbExpected.toString().isEmpty() ? " " : sbExpected.substring(0, sbExpected.length() - 2);
 
         StringBuilder sbActual = new StringBuilder();
-        arguments.forEach(argument -> sbActual.append(argument).append(", "));
+        userInput.forEach(argument -> sbActual.append(argument).append(", "));
         String actual = sbActual.toString().isEmpty() ? " " : sbActual.substring(0, sbActual.length() - 2);
 
         MessageEmbed embed = new EmbedBuilder()
@@ -59,10 +59,10 @@ public MessageCreateData getTypeAdaptingFailedMessage(@NotNull SlashCommandConte
         return new MessageCreateBuilder().setEmbeds(embed).build();
     }
 
+    @NotNull
     @Override
-    public MessageCreateData getInsufficientPermissionsMessage(@NotNull Context context) {
+    public MessageCreateData getInsufficientPermissionsMessage(@NotNull GenericInteractionDefinition interaction) {
         StringBuilder sbPermissions = new StringBuilder();
-        GenericInteractionDefinition interaction = context.getInteractionDefinition();
         interaction.getPermissions().forEach(permission -> sbPermissions.append(permission).append(", "));
         String permissions = sbPermissions.toString().isEmpty() ? "N/A" : sbPermissions.substring(0, sbPermissions.length() - 2);
         MessageEmbed embed = new EmbedBuilder()
@@ -76,8 +76,9 @@ public MessageCreateData getInsufficientPermissionsMessage(@NotNull Context cont
         return new MessageCreateBuilder().setEmbeds(embed).build();
     }
 
+    @NotNull
     @Override
-    public MessageCreateData getConstraintFailedMessage(@NotNull Context context, @NotNull ConstraintDefinition constraint) {
+    public MessageCreateData getConstraintFailedMessage(@NotNull ConstraintDefinition constraint) {
         return new MessageCreateBuilder().setEmbeds(new EmbedBuilder()
                 .setColor(Color.ORANGE)
                 .setTitle("Parameter Error")
@@ -86,8 +87,9 @@ public MessageCreateData getConstraintFailedMessage(@NotNull Context context, @N
         ).build();
     }
 
+    @NotNull
     @Override
-    public MessageCreateData getCooldownMessage(@NotNull Context context, long ms) {
+    public MessageCreateData getCooldownMessage(long ms) {
         long secs = TimeUnit.MILLISECONDS.toSeconds(ms);
         long seconds = secs % 60;
         long minutes = (secs / 60) % 60;
@@ -98,13 +100,13 @@ public MessageCreateData getCooldownMessage(@NotNull Context context, long ms) {
             cooldown.append(hours).append(hours == 1 ? " hour" : " hours");
         }
         if (minutes > 0) {
-            if (cooldown.length() > 0) {
+            if (!cooldown.isEmpty()) {
                 cooldown.append(" ");
             }
             cooldown.append(minutes).append(minutes == 1 ? " minute" : " minutes");
         }
         if (seconds > 0) {
-            if (cooldown.length() > 0) {
+            if (!cooldown.isEmpty()) {
                 cooldown.append(" ");
             }
             cooldown.append(seconds).append(seconds == 1 ? " second" : " seconds");
@@ -117,8 +119,9 @@ public MessageCreateData getCooldownMessage(@NotNull Context context, long ms) {
         ).build();
     }
 
+    @NotNull
     @Override
-    public MessageCreateData getWrongChannelTypeMessage(@NotNull Context context) {
+    public MessageCreateData getWrongChannelTypeMessage() {
         return new MessageCreateBuilder().setEmbeds(new EmbedBuilder()
                 .setColor(Color.RED)
                 .setTitle("Wrong Channel Type")
@@ -127,15 +130,16 @@ public MessageCreateData getWrongChannelTypeMessage(@NotNull Context context) {
         ).build();
     }
 
+    @NotNull
     @Override
-    public MessageCreateData getCommandExecutionFailedMessage(@NotNull Context context, @NotNull Throwable exception) {
+    public MessageCreateData getCommandExecutionFailedMessage(@NotNull GenericInteractionCreateEvent event, @NotNull Throwable exception) {
         String error;
 
         error = String.format("```The user \"%s\" attempted to execute an \"%s\" interaction at %s, " +
                         "but a \"%s\" occurred. " +
                         "Please refer to the logs for further information.```",
-                context.getEvent().getUser().toString(),
-                context.getEvent().getInteraction().getType(),
+                event.getUser(),
+                event.getInteraction().getType(),
                 new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(System.currentTimeMillis()),
                 exception.getClass().getName()
         );
@@ -149,8 +153,9 @@ public MessageCreateData getCommandExecutionFailedMessage(@NotNull Context conte
         ).build();
     }
 
+    @NotNull
     @Override
-    public MessageCreateData getUnknownInteractionMessage(@NotNull Context context) {
+    public MessageCreateData getTimedOutComponentMessage() {
         return new MessageCreateBuilder().setEmbeds(new EmbedBuilder()
                 .setColor(Color.RED)
                 .setTitle("Unknown Interaction")
diff --git a/src/main/java/com/github/kaktushose/jda/commands/embeds/error/ErrorMessageFactory.java b/src/main/java/com/github/kaktushose/jda/commands/embeds/error/ErrorMessageFactory.java
new file mode 100644
index 000000000..d765ffc59
--- /dev/null
+++ b/src/main/java/com/github/kaktushose/jda/commands/embeds/error/ErrorMessageFactory.java
@@ -0,0 +1,72 @@
+package com.github.kaktushose.jda.commands.embeds.error;
+
+import com.github.kaktushose.jda.commands.annotations.Implementation;
+import com.github.kaktushose.jda.commands.reflect.ConstraintDefinition;
+import com.github.kaktushose.jda.commands.reflect.interactions.GenericInteractionDefinition;
+import net.dv8tion.jda.api.entities.Message;
+import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent;
+import net.dv8tion.jda.api.utils.messages.MessageCreateData;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.List;
+
+/// Generic interface for factory classes that generate error messages.
+///
+/// @see Implementation
+/// @see DefaultErrorMessageFactory
+/// @since 2.0.0
+public interface ErrorMessageFactory {
+
+    /// Gets a [MessageCreateData] to send when type adapting of the user input failed.
+    ///
+    /// @param event the [GenericInteractionCreateEvent] that was attempted to type adapt
+    /// @param definition the underlying [GenericInteractionDefinition]
+    /// @param userInput the input the user provided
+    /// @return a [MessageCreateData] to send when type adapting failed
+    @NotNull
+    MessageCreateData getTypeAdaptingFailedMessage(@NotNull GenericInteractionCreateEvent event,
+                                                   @NotNull GenericInteractionDefinition definition,
+                                                   @NotNull List<String> userInput);
+
+    /// Gets a [MessageCreateData] to send when a user is missing permissions.
+    ///
+    /// @param definition the corresponding [GenericInteractionDefinition]
+    /// @return a [MessageCreateData] to send when a user is missing permissions
+    @NotNull
+    MessageCreateData getInsufficientPermissionsMessage(@NotNull GenericInteractionDefinition definition);
+
+    /// Gets a [MessageCreateData] to send when a parameter constraint fails.
+    ///
+    /// @param constraint the corresponding [ConstraintDefinition] that failed
+    /// @return a [MessageCreateData] to send when a parameter constraint fails
+    @NotNull
+    MessageCreateData getConstraintFailedMessage(@NotNull ConstraintDefinition constraint);
+
+    /// Gets a [Message] to send when a command still has a cooldown.
+    ///
+    /// @param ms the remaining cooldown in milliseconds
+    /// @return a [MessageCreateData] to send when a command still has a cooldown
+    @NotNull
+    MessageCreateData getCooldownMessage(long ms);
+
+    /// Gets a [MessageCreateData] to send when the channel type isn't suitable for the command.
+    ///
+    /// @return a [MessageCreateData] to send when the channel type isn't suitable for the command
+    @NotNull
+    MessageCreateData getWrongChannelTypeMessage();
+
+    /// Gets a [MessageCreateData] to send when the command execution failed.
+    ///
+    /// @param event     the corresponding [GenericInteractionCreateEvent]
+    /// @param exception the [Throwable] that made the command execution fail
+    /// @return a [MessageCreateData] to send when the command execution failed
+    @NotNull
+    MessageCreateData getCommandExecutionFailedMessage(@NotNull GenericInteractionCreateEvent event, @NotNull Throwable exception);
+
+    /// Gets a [MessageCreateData] to send when an incoming component interaction already timed out.
+    ///
+    /// @return a [MessageCreateData] to send when an incoming component interaction already timed out
+    @NotNull
+    MessageCreateData getTimedOutComponentMessage();
+
+}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/embeds/JsonErrorMessageFactory.java b/src/main/java/com/github/kaktushose/jda/commands/embeds/error/JsonErrorMessageFactory.java
similarity index 72%
rename from src/main/java/com/github/kaktushose/jda/commands/embeds/JsonErrorMessageFactory.java
rename to src/main/java/com/github/kaktushose/jda/commands/embeds/error/JsonErrorMessageFactory.java
index 94964f3d9..fb0550194 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/embeds/JsonErrorMessageFactory.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/embeds/error/JsonErrorMessageFactory.java
@@ -1,17 +1,15 @@
-package com.github.kaktushose.jda.commands.embeds;
+package com.github.kaktushose.jda.commands.embeds.error;
 
-import com.github.kaktushose.jda.commands.data.EmbedCache;
-import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
-import com.github.kaktushose.jda.commands.dispatching.interactions.commands.CommandEvent;
-import com.github.kaktushose.jda.commands.dispatching.interactions.commands.SlashCommandContext;
+import com.github.kaktushose.jda.commands.dispatching.events.interactions.CommandEvent;
+import com.github.kaktushose.jda.commands.embeds.EmbedCache;
 import com.github.kaktushose.jda.commands.reflect.ConstraintDefinition;
 import com.github.kaktushose.jda.commands.reflect.interactions.GenericInteractionDefinition;
 import com.github.kaktushose.jda.commands.reflect.interactions.commands.SlashCommandDefinition;
+import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent;
 import net.dv8tion.jda.api.utils.messages.MessageCreateData;
 import org.jetbrains.annotations.NotNull;
 
 import java.text.SimpleDateFormat;
-import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
@@ -30,15 +28,17 @@ public JsonErrorMessageFactory(EmbedCache embedCache) {
         this.embedCache = embedCache;
     }
 
+    @NotNull
     @Override
-    public MessageCreateData getTypeAdaptingFailedMessage(@NotNull SlashCommandContext context) {
+    public MessageCreateData getTypeAdaptingFailedMessage(@NotNull GenericInteractionCreateEvent event,
+                                                          @NotNull GenericInteractionDefinition definition,
+                                                          @NotNull List<String> userInput) {
         if (!embedCache.containsEmbed("typeAdaptingFailed")) {
-            return super.getTypeAdaptingFailedMessage(context);
+            return super.getTypeAdaptingFailedMessage(event, definition, userInput);
         }
 
         StringBuilder sbExpected = new StringBuilder();
-        SlashCommandDefinition command = context.getCommand();
-        List<String> arguments = Arrays.asList(context.getInput());
+        SlashCommandDefinition command = (SlashCommandDefinition) definition;
 
         command.getParameters().forEach(parameter -> {
             if (CommandEvent.class.isAssignableFrom(parameter.type())) {
@@ -53,7 +53,7 @@ public MessageCreateData getTypeAdaptingFailedMessage(@NotNull SlashCommandConte
         String expected = sbExpected.toString().isEmpty() ? " " : sbExpected.substring(0, sbExpected.length() - 2);
 
         StringBuilder sbActual = new StringBuilder();
-        arguments.forEach(argument -> sbActual.append(argument).append(", "));
+        userInput.forEach(argument -> sbActual.append(argument).append(", "));
         String actual = sbActual.toString().isEmpty() ? " " : sbActual.substring(0, sbActual.length() - 2);
 
         return embedCache.getEmbed("typeAdaptingFailed")
@@ -63,13 +63,13 @@ public MessageCreateData getTypeAdaptingFailedMessage(@NotNull SlashCommandConte
                 .toMessageCreateData();
     }
 
+    @NotNull
     @Override
-    public MessageCreateData getInsufficientPermissionsMessage(@NotNull Context context) {
+    public MessageCreateData getInsufficientPermissionsMessage(@NotNull GenericInteractionDefinition interaction) {
         if (!embedCache.containsEmbed("insufficientPermissions")) {
-            return super.getInsufficientPermissionsMessage(context);
+            return super.getInsufficientPermissionsMessage(interaction);
         }
 
-        GenericInteractionDefinition interaction = context.getInteractionDefinition();
         StringBuilder sbPermissions = new StringBuilder();
         interaction.getPermissions().forEach(permission -> sbPermissions.append(permission).append(", "));
         String permissions = sbPermissions.toString().isEmpty() ? "N/A" : sbPermissions.substring(0, sbPermissions.length() - 2);
@@ -80,20 +80,22 @@ public MessageCreateData getInsufficientPermissionsMessage(@NotNull Context cont
                 .toMessageCreateData();
     }
 
+    @NotNull
     @Override
-    public MessageCreateData getConstraintFailedMessage(@NotNull Context context, @NotNull ConstraintDefinition constraint) {
+    public MessageCreateData getConstraintFailedMessage(@NotNull ConstraintDefinition constraint) {
         if (!embedCache.containsEmbed("constraintFailed")) {
-            return super.getConstraintFailedMessage(context, constraint);
+            return super.getConstraintFailedMessage(constraint);
         }
         return embedCache.getEmbed("constraintFailed")
                 .injectValue("message", constraint.message())
                 .toMessageCreateData();
     }
 
+    @NotNull
     @Override
-    public MessageCreateData getCooldownMessage(@NotNull Context context, long ms) {
+    public MessageCreateData getCooldownMessage(long ms) {
         if (!embedCache.containsEmbed("cooldown")) {
-            return super.getCooldownMessage(context, ms);
+            return super.getCooldownMessage(ms);
         }
         long seconds = TimeUnit.MILLISECONDS.toSeconds(ms);
         long s = seconds % 60;
@@ -106,24 +108,26 @@ public MessageCreateData getCooldownMessage(@NotNull Context context, long ms) {
                 .toMessageCreateData();
     }
 
+    @NotNull
     @Override
-    public MessageCreateData getWrongChannelTypeMessage(@NotNull Context context) {
+    public MessageCreateData getWrongChannelTypeMessage() {
         if (!embedCache.containsEmbed("wrongChannel")) {
-            return super.getWrongChannelTypeMessage(context);
+            return super.getWrongChannelTypeMessage();
         }
         return embedCache.getEmbed("wrongChannel").toMessageCreateData();
     }
 
+    @NotNull
     @Override
-    public MessageCreateData getCommandExecutionFailedMessage(@NotNull Context context, @NotNull Throwable exception) {
+    public MessageCreateData getCommandExecutionFailedMessage(@NotNull GenericInteractionCreateEvent event, @NotNull Throwable exception) {
         if (!embedCache.containsEmbed("executionFailed")) {
-            return super.getCommandExecutionFailedMessage(context, exception);
+            return super.getCommandExecutionFailedMessage(event, exception);
         }
         String error = String.format("```The user \"%s\" attempted to execute an \"%s\" interaction at %s, " +
                         "but a \"%s\" occurred. " +
                         "Please refer to the logs for further information.```",
-                context.getEvent().getUser().toString(),
-                context.getEvent().getInteraction().getType(),
+                event.getUser(),
+                event.getInteraction().getType(),
                 new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(System.currentTimeMillis()),
                 exception.getClass().getName()
         );
@@ -132,10 +136,11 @@ public MessageCreateData getCommandExecutionFailedMessage(@NotNull Context conte
                 .toMessageCreateData();
     }
 
+    @NotNull
     @Override
-    public MessageCreateData getUnknownInteractionMessage(@NotNull Context context) {
+    public MessageCreateData getTimedOutComponentMessage() {
         if (!embedCache.containsEmbed("unknownInteraction")) {
-            return super.getUnknownInteractionMessage(context);
+            return super.getTimedOutComponentMessage();
         }
         return embedCache.getEmbed("unknownInteraction").toMessageCreateData();
     }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/embeds/error/package-info.java b/src/main/java/com/github/kaktushose/jda/commands/embeds/error/package-info.java
new file mode 100644
index 000000000..f073afe16
--- /dev/null
+++ b/src/main/java/com/github/kaktushose/jda/commands/embeds/error/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Factory classes for generating error embeds.
+ */
+package com.github.kaktushose.jda.commands.embeds.error;
diff --git a/src/main/java/com/github/kaktushose/jda/commands/embeds/package-info.java b/src/main/java/com/github/kaktushose/jda/commands/embeds/package-info.java
index 3fd364b2e..2236b3ade 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/embeds/package-info.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/embeds/package-info.java
@@ -1,4 +1,2 @@
-/**
- * Factory classes for generating error embeds.
- */
-package com.github.kaktushose.jda.commands.embeds;
+/// Helper and factory classes for handling embeds.
+package com.github.kaktushose.jda.commands.embeds;
\ No newline at end of file
diff --git a/src/main/java/com/github/kaktushose/jda/commands/internal/Helpers.java b/src/main/java/com/github/kaktushose/jda/commands/internal/Helpers.java
new file mode 100644
index 000000000..9145cc7c2
--- /dev/null
+++ b/src/main/java/com/github/kaktushose/jda/commands/internal/Helpers.java
@@ -0,0 +1,139 @@
+package com.github.kaktushose.jda.commands.internal;
+
+import com.github.kaktushose.jda.commands.annotations.interactions.Permissions;
+import com.github.kaktushose.jda.commands.annotations.interactions.ReplyConfig;
+import com.github.kaktushose.jda.commands.reflect.MethodBuildContext;
+import net.dv8tion.jda.api.entities.Guild;
+import net.dv8tion.jda.api.entities.channel.middleman.GuildChannel;
+import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent;
+import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.NotNull;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.lang.reflect.Method;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Optional;
+import java.util.Set;
+
+/// Collection of helper methods that are used inside the framework.
+///
+/// @since 4.0.0
+@ApiStatus.Internal
+public final class Helpers {
+
+    private static final Logger log = LoggerFactory.getLogger(Helpers.class);
+
+    /// Sanitizes a String containing a raw mention. This will remove all markdown characters namely
+    /// _`<`, `@`, `#`, `&`, `!`, `>`_.
+    /// For instance: `<@!393843637437464588>` gets sanitized to `393843637437464588`.
+    ///
+    /// @param mention the raw String to sanitize
+    /// @return the sanitized String
+    @NotNull
+    public static String sanitizeMention(@NotNull String mention) {
+        if (mention.matches("<[@#][&!]?([0-9]{4,})>")) {
+            return mention.replaceAll("<[@#][&!]?", "").replace(">", "");
+        }
+        return mention;
+    }
+
+    /// Attempts to resolve a [GuildChannel] based on user input.
+    ///
+    /// @param raw   the String the [GuildChannel] should be resolved from
+    /// @param event the corresponding [GenericInteractionCreateEvent]
+    /// @return an [Optional] holding the resolved [GuildChannel] or an empty [Optional] if the resolving failed
+    @NotNull
+    public static Optional<GuildChannel> resolveGuildChannel(@NotNull String raw, @NotNull GenericInteractionCreateEvent event) {
+        GuildChannel guildChannel;
+        raw = sanitizeMention(raw);
+
+        Guild guild = event.getGuild();
+        if (guild == null) {
+            return Optional.empty();
+        }
+        if (raw.matches("\\d+")) {
+            guildChannel = guild.getGuildChannelById(raw);
+        } else {
+            String finalRaw = raw;
+            guildChannel = guild.getChannels().stream().filter(it -> it.getName().equalsIgnoreCase(finalRaw))
+                    .findFirst().orElse(null);
+        }
+        return Optional.ofNullable(guildChannel);
+    }
+
+    /// Extracts the permissions from a [MethodBuildContext]. This combines the permissions of the method and the class.
+    ///
+    /// @param context the [MethodBuildContext] to extract the permissions from
+    /// @return a possibly-empty set of all permissions
+    @NotNull
+    public static Set<String> permissions(@NotNull MethodBuildContext context) {
+        Permissions permission = context.method().getAnnotation(Permissions.class);
+
+        if (permission != null) {
+            HashSet<String> mergedPermissions = new HashSet<>(context.permissions());
+            mergedPermissions.addAll(Set.of(permission.value()));
+            return Collections.unmodifiableSet(mergedPermissions);
+        }
+        return context.permissions();
+    }
+
+    /// Constructs the [com.github.kaktushose.jda.commands.reflect.interactions.ReplyConfig ReplyConfig] based on the
+    /// passed [Method].
+    ///
+    /// This will first attempt to use the [ReplyConfig] annotation of the method and then of the class. If neither is
+    /// present will fall back to the
+    /// [com.github.kaktushose.jda.commands.dispatching.reply.GlobalReplyConfig GlobalReplyConfig].
+    ///
+    /// @param method the [Method] to use
+    /// @return the [com.github.kaktushose.jda.commands.reflect.interactions.ReplyConfig ReplyConfig]
+    @NotNull
+    public static com.github.kaktushose.jda.commands.reflect.interactions.ReplyConfig replyConfig(@NotNull Method method) {
+        var global = method.getDeclaringClass().getAnnotation(ReplyConfig.class);
+        var local = method.getAnnotation(ReplyConfig.class);
+
+        if (global == null && local == null)
+            return new com.github.kaktushose.jda.commands.reflect.interactions.ReplyConfig();
+        if (local == null)
+            return new com.github.kaktushose.jda.commands.reflect.interactions.ReplyConfig(global);
+
+        return new com.github.kaktushose.jda.commands.reflect.interactions.ReplyConfig(local);
+    }
+
+    /// Checks if the given parameter is present at the [Method] at the given index.
+    ///
+    /// @param method the [Method] to check
+    /// @param index  the index the parameter is expected to be at
+    /// @param type   the type of the parameter
+    /// @return `true` if the parameter is present
+    public static boolean isIncorrectParameterType(@NotNull Method method, int index, @NotNull Class<?> type) {
+        if (!type.isAssignableFrom(method.getParameters()[index].getType())) {
+            log.error("An error has occurred! Skipping Interaction {}.{}:",
+                    method.getDeclaringClass().getSimpleName(),
+                    method.getName(),
+                    new IllegalArgumentException(String.format("%d. parameter must be of type %s", index + 1, type.getSimpleName())));
+            return true;
+        }
+        return false;
+    }
+
+    /// Checks if a [Method] has the given parameter count.
+    ///
+    /// @param count the parameter count
+    /// @return `true` if the method has the given parameter count
+    public static boolean isIncorrectParameterAmount(@NotNull Method method, int count) {
+        if (method.getParameters().length != count) {
+            log.error("An error has occurred! Skipping Interaction {}.{}:",
+                    method.getDeclaringClass().getSimpleName(),
+                    method.getName(),
+                    new IllegalArgumentException(String.format(
+                            "Invalid amount of parameters!. Expected: %d Actual: %d",
+                            count,
+                            method.getParameters().length
+                    )));
+            return true;
+        }
+        return false;
+    }
+}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/JDAContext.java b/src/main/java/com/github/kaktushose/jda/commands/internal/JDAContext.java
similarity index 98%
rename from src/main/java/com/github/kaktushose/jda/commands/JDAContext.java
rename to src/main/java/com/github/kaktushose/jda/commands/internal/JDAContext.java
index 612ccf373..145a57e7e 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/JDAContext.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/internal/JDAContext.java
@@ -1,4 +1,4 @@
-package com.github.kaktushose.jda.commands;
+package com.github.kaktushose.jda.commands.internal;
 
 import net.dv8tion.jda.api.JDA;
 import net.dv8tion.jda.api.entities.Guild;
diff --git a/src/main/java/com/github/kaktushose/jda/commands/data/CommandTree.java b/src/main/java/com/github/kaktushose/jda/commands/internal/register/CommandTree.java
similarity index 96%
rename from src/main/java/com/github/kaktushose/jda/commands/data/CommandTree.java
rename to src/main/java/com/github/kaktushose/jda/commands/internal/register/CommandTree.java
index e82ed4a24..cd492d494 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/data/CommandTree.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/internal/register/CommandTree.java
@@ -1,7 +1,8 @@
-package com.github.kaktushose.jda.commands.data;
+package com.github.kaktushose.jda.commands.internal.register;
 
 import com.github.kaktushose.jda.commands.reflect.interactions.commands.SlashCommandDefinition;
 import net.dv8tion.jda.api.interactions.commands.build.SlashCommandData;
+import org.jetbrains.annotations.ApiStatus;
 
 import java.util.Collection;
 import java.util.List;
@@ -14,6 +15,7 @@
  * @see <a href="https://discord.com/developers/docs/interactions/application-commands#subcommands-and-subcommand-groups">Discord Subcommands and Subcommand Groups Documentation</a>
  * @since 2.3.0
  */
+@ApiStatus.Internal
 public record CommandTree(
         TreeNode root
 ) {
diff --git a/src/main/java/com/github/kaktushose/jda/commands/SlashCommandUpdater.java b/src/main/java/com/github/kaktushose/jda/commands/internal/register/SlashCommandUpdater.java
similarity index 96%
rename from src/main/java/com/github/kaktushose/jda/commands/SlashCommandUpdater.java
rename to src/main/java/com/github/kaktushose/jda/commands/internal/register/SlashCommandUpdater.java
index b3be2c4b2..2efe3fc4b 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/SlashCommandUpdater.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/internal/register/SlashCommandUpdater.java
@@ -1,7 +1,7 @@
-package com.github.kaktushose.jda.commands;
+package com.github.kaktushose.jda.commands.internal.register;
 
 import com.github.kaktushose.jda.commands.annotations.interactions.SlashCommand;
-import com.github.kaktushose.jda.commands.data.CommandTree;
+import com.github.kaktushose.jda.commands.internal.JDAContext;
 import com.github.kaktushose.jda.commands.reflect.InteractionRegistry;
 import com.github.kaktushose.jda.commands.reflect.interactions.commands.GenericCommandDefinition;
 import com.github.kaktushose.jda.commands.reflect.interactions.commands.SlashCommandDefinition;
@@ -10,6 +10,7 @@
 import net.dv8tion.jda.api.interactions.commands.Command;
 import net.dv8tion.jda.api.interactions.commands.build.CommandData;
 import net.dv8tion.jda.api.interactions.commands.build.SlashCommandData;
+import org.jetbrains.annotations.ApiStatus;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -23,6 +24,7 @@
  * @see CommandTree
  * @since 2.3.0
  */
+@ApiStatus.Internal
 public class SlashCommandUpdater {
 
     private static final Logger log = LoggerFactory.getLogger(SlashCommandUpdater.class);
diff --git a/src/main/java/com/github/kaktushose/jda/commands/data/TreeNode.java b/src/main/java/com/github/kaktushose/jda/commands/internal/register/TreeNode.java
similarity index 97%
rename from src/main/java/com/github/kaktushose/jda/commands/data/TreeNode.java
rename to src/main/java/com/github/kaktushose/jda/commands/internal/register/TreeNode.java
index 7fa68c38b..eae95bb9b 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/data/TreeNode.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/internal/register/TreeNode.java
@@ -1,6 +1,5 @@
-package com.github.kaktushose.jda.commands.data;
+package com.github.kaktushose.jda.commands.internal.register;
 
-import com.github.kaktushose.jda.commands.SlashCommandUpdater;
 import com.github.kaktushose.jda.commands.reflect.interactions.commands.SlashCommandDefinition;
 import net.dv8tion.jda.api.Permission;
 import net.dv8tion.jda.api.interactions.commands.DefaultMemberPermissions;
@@ -8,6 +7,7 @@
 import net.dv8tion.jda.api.interactions.commands.build.SlashCommandData;
 import net.dv8tion.jda.api.interactions.commands.build.SubcommandGroupData;
 import net.dv8tion.jda.api.interactions.commands.localization.LocalizationFunction;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
@@ -21,6 +21,7 @@
  * @see CommandTree
  * @since 2.3.0
  */
+@ApiStatus.Internal
 public record TreeNode(
         String name,
         SlashCommandDefinition command,
@@ -181,7 +182,7 @@ private void toCommandData(Collection<SlashCommandData> commands) {
     private SlashCommandData createRootCommand(String name, List<TreeNode> children) {
         SlashCommandData result = Commands.slash(name, "empty description");
         List<SlashCommandDefinition> subCommands = unwrapDefinitions(children);
-        LocalizationFunction function = subCommands.get(0).getLocalizationFunction();
+        LocalizationFunction function = subCommands.getFirst().getLocalizationFunction();
 
         boolean isNSFW = false;
         boolean isGuildOnly = false;
diff --git a/src/main/java/com/github/kaktushose/jda/commands/permissions/DefaultPermissionsProvider.java b/src/main/java/com/github/kaktushose/jda/commands/permissions/DefaultPermissionsProvider.java
index 5e4e80be9..45240803d 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/permissions/DefaultPermissionsProvider.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/permissions/DefaultPermissionsProvider.java
@@ -1,6 +1,6 @@
 package com.github.kaktushose.jda.commands.permissions;
 
-import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
+import com.github.kaktushose.jda.commands.dispatching.context.InvocationContext;
 import net.dv8tion.jda.api.Permission;
 import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.User;
@@ -10,32 +10,37 @@
 
 import java.util.Arrays;
 
-/**
- * Default implementation of {@link PermissionsProvider} with the following behaviour:
- * <ul>
- *     <li>{@link PermissionsProvider#hasPermission(User, Context)} will always return {@code true}</li>
- *     <li>
- *         {@link PermissionsProvider#hasPermission(Member, Context)} will check against the default Discord permissions. More
- *         formally, this method will work with any permission provided by {@link Permission#values()}, ignoring the
- *         case. Any other permission String will be ignored.
- *     </li>
- * </ul>
- *
- * @see PermissionsProvider
- * @since 2.0.0
- */
+/// Default implementation of [PermissionsProvider] with the following behaviour:
+///
+///   - [#hasPermission(User,InvocationContext)] will always return `true`
+///   -
+///     [#hasPermission(Member,InvocationContext)] will check against the default Discord permissions. More
+///     formally, this method will work with any permission provided by [Permission#values()], ignoring the
+///     case. Any other permission String will be ignored.
+///
+///
+///
+/// @see PermissionsProvider
+/// @since 2.0.0
 public class DefaultPermissionsProvider implements PermissionsProvider {
 
     private static final Logger log = LoggerFactory.getLogger(DefaultPermissionsProvider.class);
 
+    /// Doesn't perform checks and will always return `true`.
+    ///
+    /// @return always `true`
     @Override
-    public boolean hasPermission(@NotNull User user, @NotNull Context context) {
+    public boolean hasPermission(@NotNull User user, @NotNull InvocationContext<?> context) {
         return true;
     }
 
+    /// Checks against the default Discord permissions.
+    ///
+    /// More formally, this method will work with any permission provided by [Permission#values()], case-insensitive.
+    /// Any other permission String will be ignored.
     @Override
-    public boolean hasPermission(@NotNull Member member, @NotNull Context context) {
-        for (String s : context.getInteractionDefinition().getPermissions()) {
+    public boolean hasPermission(@NotNull Member member, @NotNull InvocationContext<?> context) {
+        for (String s : context.definition().getPermissions()) {
             // not a discord perm, continue
             if (Arrays.stream(Permission.values()).noneMatch(p -> p.name().equalsIgnoreCase(s))) {
                 continue;
diff --git a/src/main/java/com/github/kaktushose/jda/commands/permissions/PermissionsProvider.java b/src/main/java/com/github/kaktushose/jda/commands/permissions/PermissionsProvider.java
index 54cd209b1..8a4f9ea44 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/permissions/PermissionsProvider.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/permissions/PermissionsProvider.java
@@ -1,39 +1,33 @@
 package com.github.kaktushose.jda.commands.permissions;
 
 import com.github.kaktushose.jda.commands.annotations.interactions.Permissions;
-import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
+import com.github.kaktushose.jda.commands.dispatching.context.InvocationContext;
 import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.User;
 import org.jetbrains.annotations.NotNull;
 
-/**
- * Interface for performing permission checks.
- *
- * @see com.github.kaktushose.jda.commands.annotations.Implementation
- * @see DefaultPermissionsProvider
- * @see Permissions Permission
- * @since 2.0.0
- */
+/// Interface for performing permission checks.
+///
+/// @see com.github.kaktushose.jda.commands.annotations.Implementation
+/// @see DefaultPermissionsProvider
+/// @see Permissions Permission
+/// @since 2.0.0
 public interface PermissionsProvider {
 
-    /**
-     * Checks if a {@link User} has permissions. Compared to {@link #hasPermission(Member, Context)} this method will be
-     * called if the command gets executed in a non-guild context, where no member object is available.
-     *
-     * @param user    the {@link User} to perform the check against
-     * @param context the corresponding {@link Context}
-     * @return {@code true} if the user has the permission to execute the command
-     * @see #hasPermission(Member, Context)
-     */
-    boolean hasPermission(@NotNull User user, @NotNull Context context);
+    /// Checks if a [User] has permissions. Compared to [#hasPermission(Member, InvocationContext)] this method will be
+    /// called if the command gets executed in a non-guild context, where no member object is available.
+    ///
+    /// @param user    the [User] to perform the check against
+    /// @param context the corresponding [InvocationContext]
+    /// @return `true` if the user has the permission to execute the command
+    /// @see #hasPermission(Member, InvocationContext)
+    boolean hasPermission(@NotNull User user, @NotNull InvocationContext<?> context);
 
-    /**
-     * Checks if a {@link Member} has permissions.
-     *
-     * @param member  the {@link Member} to perform the check against
-     * @param context the corresponding {@link Context}
-     * @return {@code true} if the user has the permission to execute the command
-     */
-    boolean hasPermission(@NotNull Member member, @NotNull Context context);
+    /// Checks if a [Member] has permissions.
+    ///
+    /// @param member  the [Member] to perform the check against
+    /// @param context the corresponding [InvocationContext]
+    /// @return `true` if the user has the permission to execute the command
+    boolean hasPermission(@NotNull Member member, @NotNull InvocationContext<?> context);
 
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/reflect/ImplementationRegistry.java b/src/main/java/com/github/kaktushose/jda/commands/reflect/ImplementationRegistry.java
index df806e3e7..ff3f4eaa9 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/reflect/ImplementationRegistry.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/reflect/ImplementationRegistry.java
@@ -11,8 +11,8 @@
 import com.github.kaktushose.jda.commands.dispatching.middleware.Priority;
 import com.github.kaktushose.jda.commands.dispatching.validation.Validator;
 import com.github.kaktushose.jda.commands.dispatching.validation.ValidatorRegistry;
-import com.github.kaktushose.jda.commands.embeds.DefaultErrorMessageFactory;
-import com.github.kaktushose.jda.commands.embeds.ErrorMessageFactory;
+import com.github.kaktushose.jda.commands.embeds.error.DefaultErrorMessageFactory;
+import com.github.kaktushose.jda.commands.embeds.error.ErrorMessageFactory;
 import com.github.kaktushose.jda.commands.permissions.DefaultPermissionsProvider;
 import com.github.kaktushose.jda.commands.permissions.PermissionsProvider;
 import com.github.kaktushose.jda.commands.scope.DefaultGuildScopeProvider;
diff --git a/src/main/java/com/github/kaktushose/jda/commands/reflect/InteractionRegistry.java b/src/main/java/com/github/kaktushose/jda/commands/reflect/InteractionRegistry.java
index b50f04e7c..aabad13a8 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/reflect/InteractionRegistry.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/reflect/InteractionRegistry.java
@@ -24,6 +24,7 @@
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
+import java.util.function.Predicate;
 
 /**
  * Central registry for all {@link SlashCommandDefinition CommandDefinitions}.
@@ -94,6 +95,33 @@ public void index(@NotNull Class<?> clazz, @NotNull String... packages) {
                 definitions.size());
     }
 
+    /**
+     * Attempts to find a {@link GenericInteractionDefinition} of type {@link T} based on the given {@link Predicate}.
+     *
+     * @param type          the type of the {@link GenericInteractionDefinition} to find
+     * @param internalError {@code true} if the {@link GenericInteractionDefinition} must be found and not finding it
+     *                      indicates a framework bug
+     * @param predicate     the {@link Predicate} used to find the {@link GenericInteractionDefinition}
+     * @param <T>           a subtype of {@link GenericInteractionDefinition}
+     * @return {@link T}
+     * @throws IllegalStateException    if no {@link GenericInteractionDefinition} was found, although this mandatory
+     *                                  should have been the case. This is a rare occasion and can be considered a
+     *                                  framework bug
+     * @throws IllegalArgumentException if no {@link GenericInteractionDefinition} was found, because the
+     *                                  {@link Predicate} didn't include any elements
+     */
+    public <T extends GenericInteractionDefinition> T find(Class<T> type, boolean internalError, Predicate<T> predicate) {
+        return definitions.stream()
+                .filter(type::isInstance)
+                .map(type::cast)
+                .filter(predicate)
+                .findFirst()
+                .orElseThrow(() -> internalError
+                        ? new IllegalStateException("No interaction found! Please report this error the the devs of jda-commands.")
+                        : new IllegalArgumentException("No interaction found! Please check that the referenced interaction method exists.")
+                );
+    }
+
     /**
      * Gets a possibly-empty list of all {@link GenericCommandDefinition CommandDefinitions}.
      *
diff --git a/src/main/java/com/github/kaktushose/jda/commands/reflect/MethodBuildContext.java b/src/main/java/com/github/kaktushose/jda/commands/reflect/MethodBuildContext.java
index 0ca916293..f92c549bd 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/reflect/MethodBuildContext.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/reflect/MethodBuildContext.java
@@ -3,13 +3,17 @@
 import com.github.kaktushose.jda.commands.annotations.interactions.Interaction;
 import com.github.kaktushose.jda.commands.dispatching.validation.ValidatorRegistry;
 import com.github.kaktushose.jda.commands.reflect.interactions.AutoCompleteDefinition;
+import com.github.kaktushose.jda.commands.reflect.interactions.GenericInteractionDefinition;
 import net.dv8tion.jda.api.interactions.commands.localization.LocalizationFunction;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 
 import java.lang.reflect.Method;
 import java.util.Collection;
 import java.util.Set;
 
+/// Holds all objects needed to create a [GenericInteractionDefinition].
+@ApiStatus.Internal
 public record MethodBuildContext(
         @NotNull ValidatorRegistry validatorRegistry,
         @NotNull LocalizationFunction localizationFunction,
diff --git a/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/AutoCompleteDefinition.java b/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/AutoCompleteDefinition.java
index 6566bcdc9..a994f97fa 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/AutoCompleteDefinition.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/AutoCompleteDefinition.java
@@ -1,9 +1,9 @@
 package com.github.kaktushose.jda.commands.reflect.interactions;
 
-import com.github.kaktushose.jda.commands.Helpers;
+import com.github.kaktushose.jda.commands.internal.Helpers;
 import com.github.kaktushose.jda.commands.annotations.interactions.AutoComplete;
 import com.github.kaktushose.jda.commands.annotations.interactions.Interaction;
-import com.github.kaktushose.jda.commands.dispatching.interactions.autocomplete.AutoCompleteEvent;
+import com.github.kaktushose.jda.commands.dispatching.events.interactions.AutoCompleteEvent;
 import org.jetbrains.annotations.NotNull;
 
 import java.lang.reflect.Method;
diff --git a/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/CustomId.java b/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/CustomId.java
index 977e0ef46..eb4e0dfb5 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/CustomId.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/CustomId.java
@@ -1,21 +1,90 @@
 package com.github.kaktushose.jda.commands.reflect.interactions;
 
-/**
- * Indicates that this class can create a component or modal which Discord requires a custom id for.
- *
- * @see 4.0.0
- */
-public interface CustomId {
+import com.github.kaktushose.jda.commands.dispatching.internal.Runtime;
+import com.github.kaktushose.jda.commands.reflect.interactions.components.GenericComponentDefinition;
+import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.NotNull;
+
+/// Indicates that this class can create a component or modal which Discord requires a custom id for.
+///
+/// @implSpec the custom id has the following structure: `[prefix.runtimeId.definitionId]`. The prefix will always be `jdac`,
+/// indicating that this id was created by jda-commands. The runtime id is a UUID or the String literal `independent`,
+/// if the component or modal works runtime independent. The definition id is the hash value of the full class name and
+/// method name combined: `(method.getDeclaringClass.getName() + method.getName()).hash()`
+/// @see GenericComponentDefinition
+/// @see ModalDefinition
+/// @since 4.0.0
+@ApiStatus.Internal
+public sealed interface CustomId permits GenericComponentDefinition, ModalDefinition {
 
     String PREFIX = "jdac";
-    String CUSTOM_ID_REGEX = String.format("%s.%s", PREFIX, "[aA-zZ]+.s?-?\\d*");
+    String BOUND_CUSTOM_ID_REGEX = "^jdac\\.[0-9a-fA-F-]{36}\\.-?\\d+$";
+    String INDEPENDENT_CUSTOM_ID_REGEX = "^jdac\\.independent\\.-?\\d+$";
+
+    /// Extracts the runtime id from the passed custom id.
+    ///
+    /// @param customId the custom id to extract the runtime id from
+    /// @return the runtime id
+    @NotNull
+    static String runtimeId(@NotNull String customId) {
+        if (isIndependent(customId)) {
+            throw new IllegalArgumentException("Provided custom id is independent!");
+        }
+        return getId(customId, 1);
+    }
+
+    /// Extracts the definition id from the passed custom id.
+    ///
+    /// @param customId the definition id to extract the runtime id from
+    /// @return the runtime id
+    /// @throws IllegalArgumentException if the passed custom id is a runtime-independent id
+    @NotNull
+    static String definitionId(@NotNull String customId) {
+        return getId(customId, 2);
+    }
+
+    /// Checks if the passed custom id is runtime-independent.
+    ///
+    /// @param customId the custom id to check
+    /// @return `true` if the custom id is runtime-independent
+    static boolean isIndependent(@NotNull String customId) {
+        return customId.matches(INDEPENDENT_CUSTOM_ID_REGEX);
+    }
+
+    /// Checks if the passed custom id is runtime-bound.
+    ///
+    /// @param customId the custom id to check
+    /// @return `true` if the custom id is runtime-bound
+    static boolean isBound(@NotNull String customId) {
+        return customId.matches(BOUND_CUSTOM_ID_REGEX);
+    }
+
+    /// Checks if the passed custom id conforms to the defined format of jda-commands.
+    ///
+    /// @param customId the custom id to check
+    /// @return `true` if the passed custom id conforms to the jda-commands format
+    static boolean isInvalid(@NotNull String customId) {
+        return !(isIndependent(customId) || isBound(customId));
+    }
+
+    private static String getId(String customId, int index) {
+        if (isInvalid(customId)) {
+            throw new IllegalArgumentException("Illegal id format!");
+        }
+        return customId.split("\\.")[index];
+    }
 
-    /**
-     * Gets the custom id for this component.
-     *
-     * @param runtimeId the runtimeId of this component execution
-     * @return the runtime id
-     */
-    String createCustomId(String runtimeId);
+    /// Gets a custom id for this definition that is bound to the passed [Runtime] id.
+    ///
+    /// @param runtimeId the id of the [Runtime]
+    /// @return the custom id
+    @NotNull
+    String boundCustomId(@NotNull String runtimeId);
 
+    /// Gets a custom id for this definition that is runtime-independent.
+    ///
+    /// @return the custom id
+    /// @throws UnsupportedOperationException if the interaction this definition wraps doesn't support independent execution
+    @NotNull
+    String independentCustomId();
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/EphemeralInteractionDefinition.java b/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/EphemeralInteractionDefinition.java
index 0b26b1541..0106211b2 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/EphemeralInteractionDefinition.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/EphemeralInteractionDefinition.java
@@ -13,11 +13,11 @@
  */
 public abstract sealed class EphemeralInteractionDefinition extends GenericInteractionDefinition permits ModalDefinition, GenericCommandDefinition, GenericComponentDefinition {
 
-    protected boolean ephemeral;
+    protected final ReplyConfig replyConfig;
 
-    protected EphemeralInteractionDefinition(Method method, Set<String> permissions, boolean ephemeral) {
+    protected EphemeralInteractionDefinition(Method method, Set<String> permissions, ReplyConfig replyConfig) {
         super(method, permissions);
-        this.ephemeral = ephemeral;
+        this.replyConfig = replyConfig;
     }
 
     /**
@@ -25,17 +25,8 @@ protected EphemeralInteractionDefinition(Method method, Set<String> permissions,
      *
      * @return {@code true} if replies should be ephemeral
      */
-    public boolean isEphemeral() {
-        return ephemeral;
-    }
-
-    /**
-     * Sets whether replies should be ephemeral.
-     *
-     * @param ephemeral {@code true} if replies should be ephemeral
-     */
-    public void setEphemeral(boolean ephemeral) {
-        this.ephemeral = ephemeral;
+    public ReplyConfig replyConfig() {
+        return replyConfig;
     }
 
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/GenericInteractionDefinition.java b/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/GenericInteractionDefinition.java
index 8f5d411be..b97dc5805 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/GenericInteractionDefinition.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/GenericInteractionDefinition.java
@@ -1,11 +1,13 @@
 package com.github.kaktushose.jda.commands.reflect.interactions;
 
+import com.github.kaktushose.jda.commands.dispatching.context.InvocationContext;
 import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.util.SequencedCollection;
 import java.util.Set;
 
 /**
@@ -22,11 +24,17 @@ public sealed abstract class GenericInteractionDefinition permits AutoCompleteDe
     protected final Set<String> permissions;
 
     protected GenericInteractionDefinition(Method method, Set<String> permissions) {
-        this.definitionId = String.format("%s%s", method.getDeclaringClass().getSimpleName(), method.getName());
+        this.definitionId = String.valueOf((method.getDeclaringClass().getName() + method.getName()).hashCode());
         this.method = method;
         this.permissions = permissions;
     }
 
+    public final void invoke(Object instance, InvocationContext<?> invocation) throws InvocationTargetException, IllegalAccessException {
+        SequencedCollection<Object> arguments = invocation.arguments();
+
+        method.invoke(instance, arguments.toArray());
+    }
+
     /**
      * Returns the id of the interaction definition.
      *
diff --git a/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/ModalDefinition.java b/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/ModalDefinition.java
index 05b486136..9ffb95824 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/ModalDefinition.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/ModalDefinition.java
@@ -1,10 +1,11 @@
 package com.github.kaktushose.jda.commands.reflect.interactions;
 
-import com.github.kaktushose.jda.commands.Helpers;
+import com.github.kaktushose.jda.commands.internal.Helpers;
 import com.github.kaktushose.jda.commands.annotations.interactions.Interaction;
 import com.github.kaktushose.jda.commands.annotations.interactions.Modal;
 import com.github.kaktushose.jda.commands.annotations.interactions.Permissions;
-import com.github.kaktushose.jda.commands.dispatching.interactions.modals.ModalEvent;
+import com.github.kaktushose.jda.commands.dispatching.events.interactions.ModalEvent;
+import com.github.kaktushose.jda.commands.dispatching.internal.Runtime;
 import com.github.kaktushose.jda.commands.reflect.TextInputDefinition;
 import net.dv8tion.jda.api.interactions.modals.Modal.Builder;
 import org.jetbrains.annotations.NotNull;
@@ -24,8 +25,8 @@ public final class ModalDefinition extends EphemeralInteractionDefinition implem
     private final String title;
     private final List<TextInputDefinition> textInputs;
 
-    private ModalDefinition(Method method, Set<String> permissions, boolean ephemeral, String title, List<TextInputDefinition> textInputs) {
-        super(method, permissions, ephemeral);
+    private ModalDefinition(Method method, Set<String> permissions, ReplyConfig replyConfig, String title, List<TextInputDefinition> textInputs) {
+        super(method, permissions, replyConfig);
         this.title = title;
         this.textInputs = textInputs;
     }
@@ -76,19 +77,19 @@ public static Optional<ModalDefinition> build(@NotNull Method method) {
 
         Modal modal = method.getAnnotation(Modal.class);
 
-        return Optional.of(new ModalDefinition(method, permissions, modal.ephemeral(), modal.value(), textInputs));
+        return Optional.of(new ModalDefinition(method, permissions, Helpers.replyConfig(method), modal.value(), textInputs));
     }
 
     /**
      * Transforms this ModalDefinition to a {@link net.dv8tion.jda.api.interactions.modals.Modal Modal}.
      *
      * @param runtimeId the runtimeId of the
-     *                  {@link com.github.kaktushose.jda.commands.dispatching.RuntimeSupervisor.InteractionRuntime InteractionRuntime}
+     *                  {@link Runtime Runtime}
      *                  of this interaction execution
      * @return the transformed {@link net.dv8tion.jda.api.interactions.modals.Modal Modal}
      */
     public net.dv8tion.jda.api.interactions.modals.Modal toModal(String runtimeId) {
-        Builder modal = net.dv8tion.jda.api.interactions.modals.Modal.create(createCustomId(runtimeId), title);
+        Builder modal = net.dv8tion.jda.api.interactions.modals.Modal.create(boundCustomId(runtimeId), title);
 
         textInputs.forEach(textInput -> modal.addActionRow(textInput.toTextInput()));
 
@@ -119,13 +120,13 @@ public String getDisplayName() {
     }
 
     @Override
-    public String createCustomId(String runtimeId) {
-        return String.format("%s.%s%s.%s",
-                PREFIX,
-                method.getDeclaringClass().getSimpleName(),
-                method.getName(),
-                runtimeId
-        );
+    public @NotNull String boundCustomId(@NotNull String runtimeId) {
+        return "%s.%s.%s".formatted(PREFIX, runtimeId, definitionId);
+    }
+
+    @Override
+    public @NotNull String independentCustomId() {
+        throw new UnsupportedOperationException("Modals cannot be independent!");
     }
 
     @Override
@@ -133,7 +134,7 @@ public String toString() {
         return "ModalDefinition{" +
                 "title='" + title + '\'' +
                 ", textInputs=" + textInputs +
-                ", ephemeral=" + ephemeral +
+                ", replyConfig=" + replyConfig +
                 ", id='" + definitionId + '\'' +
                 ", method=" + method +
                 ", permissions=" + permissions +
diff --git a/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/ReplyConfig.java b/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/ReplyConfig.java
new file mode 100644
index 000000000..0270f899c
--- /dev/null
+++ b/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/ReplyConfig.java
@@ -0,0 +1,24 @@
+package com.github.kaktushose.jda.commands.reflect.interactions;
+
+import com.github.kaktushose.jda.commands.dispatching.reply.GlobalReplyConfig;
+import org.jetbrains.annotations.NotNull;
+
+/// Stores the configuration values for sending replies. This acts as a representation of
+/// [com.github.kaktushose.jda.commands.annotations.interactions.ReplyConfig].
+///
+/// @see [com.github.kaktushose.jda.commands.annotations.interactions.ReplyConfig]
+/// @since 4.0.0
+public record ReplyConfig(boolean ephemeral, boolean keepComponents, boolean editReply) {
+
+    /// Constructs a new ReplyConfig using the default values specified by [GlobalReplyConfig].
+    public ReplyConfig() {
+        this(GlobalReplyConfig.ephemeral, GlobalReplyConfig.keepComponents, GlobalReplyConfig.editReply);
+    }
+
+    /// Constructs a new ReplyConfig.
+    ///
+    /// @param replyConfig the [com.github.kaktushose.jda.commands.annotations.interactions.ReplyConfig] to represent
+    public ReplyConfig(@NotNull com.github.kaktushose.jda.commands.annotations.interactions.ReplyConfig replyConfig) {
+        this(replyConfig.ephemeral(), replyConfig.keepComponents(), replyConfig.editReply());
+    }
+}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/commands/ContextCommandDefinition.java b/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/commands/ContextCommandDefinition.java
index fe7a41ce6..c486fad9d 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/commands/ContextCommandDefinition.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/commands/ContextCommandDefinition.java
@@ -1,11 +1,15 @@
 package com.github.kaktushose.jda.commands.reflect.interactions.commands;
 
-import com.github.kaktushose.jda.commands.Helpers;
+import com.github.kaktushose.jda.commands.internal.Helpers;
 import com.github.kaktushose.jda.commands.annotations.interactions.ContextCommand;
 import com.github.kaktushose.jda.commands.annotations.interactions.Interaction;
 import com.github.kaktushose.jda.commands.annotations.interactions.SlashCommand;
+import com.github.kaktushose.jda.commands.dispatching.events.interactions.CommandEvent;
 import com.github.kaktushose.jda.commands.reflect.MethodBuildContext;
+import com.github.kaktushose.jda.commands.reflect.interactions.ReplyConfig;
 import net.dv8tion.jda.api.Permission;
+import net.dv8tion.jda.api.entities.Message;
+import net.dv8tion.jda.api.entities.User;
 import net.dv8tion.jda.api.interactions.commands.Command;
 import net.dv8tion.jda.api.interactions.commands.DefaultMemberPermissions;
 import net.dv8tion.jda.api.interactions.commands.build.CommandData;
@@ -28,7 +32,7 @@
 public final class ContextCommandDefinition extends GenericCommandDefinition {
 
     public ContextCommandDefinition(Method method,
-                                    boolean ephemeral,
+                                    ReplyConfig replyConfig,
                                     String name,
                                     Set<String> permissions,
                                     boolean isGuildOnly,
@@ -37,7 +41,7 @@ public ContextCommandDefinition(Method method,
                                     Set<Permission> enabledPermissions,
                                     SlashCommand.CommandScope scope,
                                     LocalizationFunction localizationFunction) {
-        super(method, ephemeral, name, permissions, isGuildOnly, isNSFW, commandType, enabledPermissions, scope, localizationFunction);
+        super(method, replyConfig, name, permissions, isGuildOnly, isNSFW, commandType, enabledPermissions, scope, localizationFunction);
     }
 
     public static Optional<ContextCommandDefinition> build(@NotNull MethodBuildContext context) {
@@ -46,6 +50,17 @@ public static Optional<ContextCommandDefinition> build(@NotNull MethodBuildConte
             return Optional.empty();
         }
 
+        if (Helpers.isIncorrectParameterAmount(method, 2)) {
+            return Optional.empty();
+        }
+        if (Helpers.isIncorrectParameterType(method, 0, CommandEvent.class)) {
+            return Optional.empty();
+        }
+        if (Helpers.isIncorrectParameterType(method, 1, User.class) && Helpers.isIncorrectParameterType(method, 1, Message.class)) {
+            return Optional.empty();
+        }
+
+
         ContextCommand command = method.getAnnotation(ContextCommand.class);
 
         Set<net.dv8tion.jda.api.Permission> enabledFor = Arrays.stream(command.enabledFor()).collect(Collectors.toSet());
@@ -55,7 +70,7 @@ public static Optional<ContextCommandDefinition> build(@NotNull MethodBuildConte
 
         return Optional.of(new ContextCommandDefinition(
                 method,
-                Helpers.ephemeral(context, command.ephemeral()),
+                Helpers.replyConfig(method),
                 command.value(),
                 Helpers.permissions(context),
                 command.isGuildOnly(),
@@ -90,7 +105,7 @@ public String toString() {
                 ", enabledPermissions=" + enabledPermissions +
                 ", scope=" + scope +
                 ", localizationFunction=" + localizationFunction +
-                ", ephemeral=" + ephemeral +
+                ", replyConfig=" + replyConfig +
                 '}';
     }
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/commands/GenericCommandDefinition.java b/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/commands/GenericCommandDefinition.java
index 2345e04e5..cf84968a3 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/commands/GenericCommandDefinition.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/commands/GenericCommandDefinition.java
@@ -2,6 +2,7 @@
 
 import com.github.kaktushose.jda.commands.annotations.interactions.SlashCommand;
 import com.github.kaktushose.jda.commands.reflect.interactions.EphemeralInteractionDefinition;
+import com.github.kaktushose.jda.commands.reflect.interactions.ReplyConfig;
 import net.dv8tion.jda.api.Permission;
 import net.dv8tion.jda.api.interactions.commands.Command;
 import net.dv8tion.jda.api.interactions.commands.build.CommandData;
@@ -18,7 +19,10 @@
  * @see ContextCommandDefinition
  * @since 4.0.0
  */
-public abstract sealed class GenericCommandDefinition extends EphemeralInteractionDefinition implements Comparable<GenericCommandDefinition> permits ContextCommandDefinition, SlashCommandDefinition {
+public abstract sealed class GenericCommandDefinition
+        extends EphemeralInteractionDefinition
+        implements Comparable<GenericCommandDefinition>
+        permits ContextCommandDefinition, SlashCommandDefinition {
 
     protected final String name;
     protected final boolean isGuildOnly;
@@ -29,7 +33,7 @@ public abstract sealed class GenericCommandDefinition extends EphemeralInteracti
     protected final LocalizationFunction localizationFunction;
 
     protected GenericCommandDefinition(Method method,
-                                       boolean ephemeral,
+                                       ReplyConfig replyConfig,
                                        String name,
                                        Set<String> permissions,
                                        boolean isGuildOnly,
@@ -38,7 +42,7 @@ protected GenericCommandDefinition(Method method,
                                        Set<Permission> enabledPermissions,
                                        SlashCommand.CommandScope scope,
                                        LocalizationFunction localizationFunction) {
-        super(method, permissions, ephemeral);
+        super(method, permissions, replyConfig);
         this.name = name;
         this.isGuildOnly = isGuildOnly;
         this.isNSFW = isNSFW;
@@ -130,7 +134,7 @@ public String toString() {
                 ", enabledPermissions=" + enabledPermissions +
                 ", scope=" + scope +
                 ", localizationFunction=" + localizationFunction +
-                ", ephemeral=" + ephemeral +
+                ", replyConfig=" + replyConfig +
                 '}';
     }
 
diff --git a/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/commands/SlashCommandDefinition.java b/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/commands/SlashCommandDefinition.java
index 35f04a035..94f51cd0f 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/commands/SlashCommandDefinition.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/commands/SlashCommandDefinition.java
@@ -1,14 +1,15 @@
 package com.github.kaktushose.jda.commands.reflect.interactions.commands;
 
-import com.github.kaktushose.jda.commands.Helpers;
+import com.github.kaktushose.jda.commands.internal.Helpers;
 import com.github.kaktushose.jda.commands.annotations.interactions.Cooldown;
 import com.github.kaktushose.jda.commands.annotations.interactions.Interaction;
 import com.github.kaktushose.jda.commands.annotations.interactions.SlashCommand;
-import com.github.kaktushose.jda.commands.dispatching.interactions.commands.CommandEvent;
+import com.github.kaktushose.jda.commands.dispatching.events.interactions.CommandEvent;
 import com.github.kaktushose.jda.commands.reflect.CooldownDefinition;
 import com.github.kaktushose.jda.commands.reflect.MethodBuildContext;
 import com.github.kaktushose.jda.commands.reflect.ParameterDefinition;
 import com.github.kaktushose.jda.commands.reflect.interactions.AutoCompleteDefinition;
+import com.github.kaktushose.jda.commands.reflect.interactions.ReplyConfig;
 import net.dv8tion.jda.api.Permission;
 import net.dv8tion.jda.api.interactions.commands.Command;
 import net.dv8tion.jda.api.interactions.commands.DefaultMemberPermissions;
@@ -34,7 +35,7 @@ public final class SlashCommandDefinition extends GenericCommandDefinition {
     private final boolean isAutoComplete;
 
     public SlashCommandDefinition(Method method,
-                                  boolean ephemeral,
+                                  ReplyConfig replyConfig,
                                   String name,
                                   Set<String> permissions,
                                   boolean isGuildOnly,
@@ -47,7 +48,7 @@ public SlashCommandDefinition(Method method,
                                   List<ParameterDefinition> parameters,
                                   CooldownDefinition cooldown,
                                   boolean isAutoComplete) {
-        super(method, ephemeral, name, permissions, isGuildOnly, isNSFW, commandType, enabledPermissions, scope, localizationFunction);
+        super(method, replyConfig, name, permissions, isGuildOnly, isNSFW, commandType, enabledPermissions, scope, localizationFunction);
         this.description = description;
         this.parameters = parameters;
         this.cooldown = cooldown;
@@ -120,7 +121,7 @@ public static Optional<SlashCommandDefinition> build(MethodBuildContext context)
 
         return Optional.of(new SlashCommandDefinition(
                 method,
-                Helpers.ephemeral(context, command.ephemeral()),
+                Helpers.replyConfig(method),
                 name,
                 Helpers.permissions(context),
                 command.isGuildOnly(),
@@ -264,7 +265,7 @@ public String toString() {
                 ", enabledPermissions=" + enabledPermissions +
                 ", scope=" + scope +
                 ", localizationFunction=" + localizationFunction +
-                ", ephemeral=" + ephemeral +
+                ", replyConfig=" + replyConfig +
                 '}';
     }
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/components/ButtonDefinition.java b/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/components/ButtonDefinition.java
index b5b3e2911..08ebf3042 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/components/ButtonDefinition.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/components/ButtonDefinition.java
@@ -1,10 +1,11 @@
 package com.github.kaktushose.jda.commands.reflect.interactions.components;
 
-import com.github.kaktushose.jda.commands.Helpers;
+import com.github.kaktushose.jda.commands.internal.Helpers;
 import com.github.kaktushose.jda.commands.annotations.interactions.Button;
 import com.github.kaktushose.jda.commands.annotations.interactions.Interaction;
-import com.github.kaktushose.jda.commands.dispatching.interactions.components.ComponentEvent;
+import com.github.kaktushose.jda.commands.dispatching.events.interactions.ComponentEvent;
 import com.github.kaktushose.jda.commands.reflect.MethodBuildContext;
+import com.github.kaktushose.jda.commands.reflect.interactions.ReplyConfig;
 import net.dv8tion.jda.api.entities.emoji.Emoji;
 import net.dv8tion.jda.api.interactions.components.buttons.ButtonStyle;
 import org.jetbrains.annotations.NotNull;
@@ -28,12 +29,12 @@ public final class ButtonDefinition extends GenericComponentDefinition {
 
     private ButtonDefinition(Method method,
                              Set<String> permissions,
-                             boolean ephemeral,
+                             ReplyConfig replyConfig,
                              String label,
                              Emoji emoji,
                              String link,
                              ButtonStyle style) {
-        super(method, permissions, ephemeral);
+        super(method, permissions, replyConfig);
         this.label = label;
         this.emoji = emoji;
         this.link = link;
@@ -71,7 +72,7 @@ public static Optional<ButtonDefinition> build(MethodBuildContext context) {
         return Optional.of(new ButtonDefinition(
                 method,
                 Helpers.permissions(context),
-                Helpers.ephemeral(context, button.ephemeral()),
+                Helpers.replyConfig(method),
                 button.value(),
                 emoji,
                 button.link(),
@@ -147,7 +148,7 @@ public String toString() {
                 ", emoji=" + emoji +
                 ", link='" + link + '\'' +
                 ", style=" + style +
-                ", ephemeral=" + ephemeral +
+                ", replyConfig=" + replyConfig +
                 ", permissions=" + permissions +
                 ", id='" + definitionId + '\'' +
                 ", method=" + method +
diff --git a/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/components/GenericComponentDefinition.java b/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/components/GenericComponentDefinition.java
index a965afa70..7a09ad808 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/components/GenericComponentDefinition.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/components/GenericComponentDefinition.java
@@ -2,31 +2,34 @@
 
 import com.github.kaktushose.jda.commands.reflect.interactions.CustomId;
 import com.github.kaktushose.jda.commands.reflect.interactions.EphemeralInteractionDefinition;
+import com.github.kaktushose.jda.commands.reflect.interactions.ReplyConfig;
 import com.github.kaktushose.jda.commands.reflect.interactions.components.menus.GenericSelectMenuDefinition;
+import org.jetbrains.annotations.NotNull;
 
 import java.lang.reflect.Method;
 import java.util.Set;
 
 /**
- * Marker class for component definitions.
+ * Marker class for name definitions.
  *
  * @see ButtonDefinition
  * @see com.github.kaktushose.jda.commands.reflect.interactions.components.menus.GenericSelectMenuDefinition GenericSelectMenuDefinition
  * @since 4.0.0
  */
-public abstract sealed class GenericComponentDefinition extends EphemeralInteractionDefinition implements CustomId permits ButtonDefinition, GenericSelectMenuDefinition {
+public abstract sealed class GenericComponentDefinition extends EphemeralInteractionDefinition implements CustomId
+        permits ButtonDefinition, GenericSelectMenuDefinition {
 
-    protected GenericComponentDefinition(Method method, Set<String> permissions, boolean ephemeral) {
-        super(method, permissions, ephemeral);
+    protected GenericComponentDefinition(Method method, Set<String> permissions, ReplyConfig replyConfig) {
+        super(method, permissions, replyConfig);
     }
 
     @Override
-    public String createCustomId(String runtimeId) {
-        return String.format("%s.%s%s.%s",
-                PREFIX,
-                method.getDeclaringClass().getSimpleName(),
-                method.getName(),
-                runtimeId
-        );
+    public @NotNull String boundCustomId(@NotNull String runtimeId) {
+        return "%s.%s.%s".formatted(PREFIX, runtimeId, definitionId);
+    }
+
+    @Override
+    public @NotNull String independentCustomId() {
+        return "%s.independent.%s".formatted(PREFIX, definitionId);
     }
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/components/menus/EntitySelectMenuDefinition.java b/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/components/menus/EntitySelectMenuDefinition.java
index 520c8500a..197978167 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/components/menus/EntitySelectMenuDefinition.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/components/menus/EntitySelectMenuDefinition.java
@@ -1,17 +1,18 @@
 package com.github.kaktushose.jda.commands.reflect.interactions.components.menus;
 
-import com.github.kaktushose.jda.commands.Helpers;
+import com.github.kaktushose.jda.commands.internal.Helpers;
 import com.github.kaktushose.jda.commands.annotations.interactions.EntitySelectMenu;
 import com.github.kaktushose.jda.commands.annotations.interactions.Interaction;
-import com.github.kaktushose.jda.commands.dispatching.interactions.components.ComponentEvent;
+import com.github.kaktushose.jda.commands.dispatching.events.interactions.ComponentEvent;
 import com.github.kaktushose.jda.commands.reflect.MethodBuildContext;
+import com.github.kaktushose.jda.commands.reflect.interactions.ReplyConfig;
+import net.dv8tion.jda.api.entities.Mentions;
 import net.dv8tion.jda.api.entities.channel.ChannelType;
 import net.dv8tion.jda.api.interactions.components.selections.EntitySelectMenu.DefaultValue;
 import net.dv8tion.jda.api.interactions.components.selections.EntitySelectMenu.SelectTarget;
 
 import java.lang.reflect.Method;
 import java.util.HashSet;
-import java.util.List;
 import java.util.Optional;
 import java.util.Set;
 
@@ -29,14 +30,14 @@ public final class EntitySelectMenuDefinition extends GenericSelectMenuDefinitio
 
     private EntitySelectMenuDefinition(Method method,
                                        Set<String> permissions,
-                                       boolean ephemeral,
+                                       ReplyConfig replyConfig,
                                        Set<SelectTarget> selectTargets,
                                        Set<DefaultValue> defaultValues,
                                        Set<ChannelType> channelTypes,
                                        String placeholder,
                                        int minValue,
                                        int maxValue) {
-        super(method, permissions, ephemeral, placeholder, minValue, maxValue);
+        super(method, permissions, replyConfig, placeholder, minValue, maxValue);
         this.selectTargets = selectTargets;
         this.defaultValues = defaultValues;
         this.channelTypes = channelTypes;
@@ -58,7 +59,7 @@ public static Optional<EntitySelectMenuDefinition> build(MethodBuildContext cont
         }
 
         if (Helpers.isIncorrectParameterType(method, 0, ComponentEvent.class) ||
-                Helpers.isIncorrectParameterType(method, 1, List.class)) {
+                Helpers.isIncorrectParameterType(method, 1, Mentions.class)) {
             return Optional.empty();
         }
 
@@ -81,7 +82,7 @@ public static Optional<EntitySelectMenuDefinition> build(MethodBuildContext cont
         return Optional.of(new EntitySelectMenuDefinition(
                 method,
                 Helpers.permissions(context),
-                Helpers.ephemeral(context, selectMenu.ephemeral()),
+                Helpers.replyConfig(method),
                 Set.of(selectMenu.value()),
                 defaultValueSet,
                 new HashSet<>(Set.of(selectMenu.channelTypes())),
@@ -92,8 +93,8 @@ public static Optional<EntitySelectMenuDefinition> build(MethodBuildContext cont
     }
 
     @Override
-    public net.dv8tion.jda.api.interactions.components.selections.EntitySelectMenu toSelectMenu(String runtimeId, boolean enabled) {
-        var menu = net.dv8tion.jda.api.interactions.components.selections.EntitySelectMenu.create(createCustomId(runtimeId), selectTargets)
+    public net.dv8tion.jda.api.interactions.components.selections.EntitySelectMenu toSelectMenu(String customId, boolean enabled) {
+        var menu = net.dv8tion.jda.api.interactions.components.selections.EntitySelectMenu.create(customId, selectTargets)
                 .setDefaultValues(defaultValues)
                 .setPlaceholder(placeholder)
                 .setRequiredRange(minValue, maxValue)
@@ -145,7 +146,7 @@ public String toString() {
                 ", minValue=" + minValue +
                 ", maxValue=" + maxValue +
                 ", permissions=" + permissions +
-                ", ephemeral=" + ephemeral +
+                ", replyConfig=" + replyConfig +
                 ", id='" + definitionId + '\'' +
                 ", method=" + method +
                 '}';
diff --git a/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/components/menus/GenericSelectMenuDefinition.java b/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/components/menus/GenericSelectMenuDefinition.java
index e0a638ce8..94508bada 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/components/menus/GenericSelectMenuDefinition.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/components/menus/GenericSelectMenuDefinition.java
@@ -1,5 +1,7 @@
 package com.github.kaktushose.jda.commands.reflect.interactions.components.menus;
 
+import com.github.kaktushose.jda.commands.dispatching.internal.Runtime;
+import com.github.kaktushose.jda.commands.reflect.interactions.ReplyConfig;
 import com.github.kaktushose.jda.commands.reflect.interactions.components.GenericComponentDefinition;
 import net.dv8tion.jda.api.interactions.components.selections.SelectMenu;
 
@@ -13,29 +15,35 @@
  * @see StringSelectMenuDefinition
  * @since 4.0.0
  */
-public abstract sealed class GenericSelectMenuDefinition<T extends SelectMenu> extends GenericComponentDefinition permits EntitySelectMenuDefinition, StringSelectMenuDefinition {
+public abstract sealed class GenericSelectMenuDefinition<T extends SelectMenu> extends GenericComponentDefinition
+        permits EntitySelectMenuDefinition, StringSelectMenuDefinition {
 
     protected final String placeholder;
     protected final int minValue;
     protected final int maxValue;
 
-    protected GenericSelectMenuDefinition(Method method, Set<String> permissions, boolean ephemeral, String placeholder, int minValue, int maxValue) {
-        super(method, permissions, ephemeral);
+    protected GenericSelectMenuDefinition(Method method,
+                                          Set<String> permissions,
+                                          ReplyConfig replyConfig,
+                                          String placeholder,
+                                          int minValue,
+                                          int maxValue) {
+        super(method, permissions, replyConfig);
         this.placeholder = placeholder;
         this.minValue = minValue;
         this.maxValue = maxValue;
     }
 
     /**
-     * Transforms this definition to a select menu component.
+     * Transforms this definition to a select menu name.
      *
-     * @param runtimeId the runtimeId of the
-     *                  {@link com.github.kaktushose.jda.commands.dispatching.RuntimeSupervisor.InteractionRuntime InteractionRuntime}
-     *                  of this interaction execution
-     * @param enabled   {@code true} if the component should be enabled
-     * @return the select menu component
+     * @param customId the runtimeId of the
+     *                 {@link Runtime Runtime}
+     *                 of this interaction execution
+     * @param enabled  {@code true} if the name should be enabled
+     * @return the select menu name
      */
-    public abstract T toSelectMenu(String runtimeId, boolean enabled);
+    public abstract T toSelectMenu(String customId, boolean enabled);
 
     /**
      * Gets the placeholder string.
diff --git a/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/components/menus/StringSelectMenuDefinition.java b/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/components/menus/StringSelectMenuDefinition.java
index e22c0c5f4..965651000 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/components/menus/StringSelectMenuDefinition.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/components/menus/StringSelectMenuDefinition.java
@@ -1,11 +1,12 @@
 package com.github.kaktushose.jda.commands.reflect.interactions.components.menus;
 
-import com.github.kaktushose.jda.commands.Helpers;
+import com.github.kaktushose.jda.commands.internal.Helpers;
 import com.github.kaktushose.jda.commands.annotations.interactions.Interaction;
 import com.github.kaktushose.jda.commands.annotations.interactions.SelectOption;
 import com.github.kaktushose.jda.commands.annotations.interactions.StringSelectMenu;
-import com.github.kaktushose.jda.commands.dispatching.interactions.components.ComponentEvent;
+import com.github.kaktushose.jda.commands.dispatching.events.interactions.ComponentEvent;
 import com.github.kaktushose.jda.commands.reflect.MethodBuildContext;
+import com.github.kaktushose.jda.commands.reflect.interactions.ReplyConfig;
 
 import java.lang.reflect.Method;
 import java.util.HashSet;
@@ -26,12 +27,12 @@ public final class StringSelectMenuDefinition extends GenericSelectMenuDefinitio
 
     private StringSelectMenuDefinition(Method method,
                                        Set<String> permissions,
-                                       boolean ephemeral,
+                                       ReplyConfig replyConfig,
                                        Set<SelectOptionDefinition> selectOptions,
                                        String placeholder,
                                        int minValue,
                                        int maxValue) {
-        super(method, permissions, ephemeral, placeholder, minValue, maxValue);
+        super(method, permissions, replyConfig, placeholder, minValue, maxValue);
         this.selectOptions = selectOptions;
     }
 
@@ -65,7 +66,7 @@ public static Optional<StringSelectMenuDefinition> build(MethodBuildContext cont
         return Optional.of(new StringSelectMenuDefinition(
                 method,
                 Helpers.permissions(context),
-                Helpers.ephemeral(context, selectMenu.ephemeral()),
+                Helpers.replyConfig(method),
                 selectOptions,
                 selectMenu.value(),
                 selectMenu.minValue(),
@@ -73,8 +74,8 @@ public static Optional<StringSelectMenuDefinition> build(MethodBuildContext cont
         ));
     }
 
-    public net.dv8tion.jda.api.interactions.components.selections.StringSelectMenu toSelectMenu(String runtimeId, boolean enabled) {
-        return net.dv8tion.jda.api.interactions.components.selections.StringSelectMenu.create(createCustomId(runtimeId))
+    public net.dv8tion.jda.api.interactions.components.selections.StringSelectMenu toSelectMenu(String customId, boolean enabled) {
+        return net.dv8tion.jda.api.interactions.components.selections.StringSelectMenu.create(customId)
                 .setPlaceholder(placeholder)
                 .setRequiredRange(minValue, maxValue)
                 .addOptions(selectOptions.stream().map(SelectOptionDefinition::toSelectOption).collect(Collectors.toSet()))
@@ -103,7 +104,7 @@ public String toString() {
                 ", placeholder='" + placeholder + '\'' +
                 ", minValue=" + minValue +
                 ", maxValue=" + maxValue +
-                ", ephemeral=" + ephemeral +
+                ", replyConfig=" + replyConfig +
                 ", permissions=" + permissions +
                 ", id='" + definitionId + '\'' +
                 ", method=" + method +
diff --git a/src/main/java/com/github/kaktushose/jda/commands/scope/DefaultGuildScopeProvider.java b/src/main/java/com/github/kaktushose/jda/commands/scope/DefaultGuildScopeProvider.java
index d7ffab805..7f8e2b0bc 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/scope/DefaultGuildScopeProvider.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/scope/DefaultGuildScopeProvider.java
@@ -13,6 +13,7 @@
  */
 public class DefaultGuildScopeProvider implements GuildScopeProvider {
 
+    /// @return always an empty set
     @Override
     public Set<Long> apply(CommandData commandData) {
         return Collections.emptySet();
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
index 33a136ec6..c3c72b9aa 100644
--- a/src/main/java/module-info.java
+++ b/src/main/java/module-info.java
@@ -1,3 +1,4 @@
+/// The base module of jda-commands
 module jda.commands {
     requires com.google.gson;
     requires jsr305;
@@ -6,4 +7,43 @@
     requires org.reflections;
     requires java.desktop;
     requires org.slf4j;
+    requires kotlin.stdlib;
+
+    // base package
+    exports com.github.kaktushose.jda.commands;
+
+    // annotations
+    exports com.github.kaktushose.jda.commands.annotations;
+    exports com.github.kaktushose.jda.commands.annotations.constraints;
+    exports com.github.kaktushose.jda.commands.annotations.interactions;
+
+    // dependency injection
+    exports com.github.kaktushose.jda.commands.dependency;
+
+    // dispatching api
+    exports com.github.kaktushose.jda.commands.dispatching;
+    exports com.github.kaktushose.jda.commands.dispatching.adapter;
+    exports com.github.kaktushose.jda.commands.dispatching.adapter.impl;
+
+    exports com.github.kaktushose.jda.commands.dispatching.context;
+    exports com.github.kaktushose.jda.commands.dispatching.events;
+    exports com.github.kaktushose.jda.commands.dispatching.events.interactions;
+
+    exports com.github.kaktushose.jda.commands.dispatching.middleware;
+    exports com.github.kaktushose.jda.commands.dispatching.middleware.impl;
+
+    exports com.github.kaktushose.jda.commands.dispatching.reply;
+
+    exports com.github.kaktushose.jda.commands.dispatching.validation;
+    exports com.github.kaktushose.jda.commands.dispatching.validation.impl;
+
+    // embed
+    exports com.github.kaktushose.jda.commands.embeds;
+    exports com.github.kaktushose.jda.commands.embeds.error;
+
+    // permissions api
+    exports com.github.kaktushose.jda.commands.permissions;
+
+    // command scope api
+    exports com.github.kaktushose.jda.commands.scope;
 }
\ No newline at end of file
diff --git a/src/main/javadoc/doc-files/flowchart.png b/src/main/javadoc/doc-files/flowchart.png
new file mode 100644
index 0000000000000000000000000000000000000000..52960e517fd4743eecd9b18adc1185868c56d151
GIT binary patch
literal 129529
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

literal 0
HcmV?d00001

diff --git a/src/main/javadoc/overview.md b/src/main/javadoc/overview.md
new file mode 100644
index 000000000..bb55cf4d6
--- /dev/null
+++ b/src/main/javadoc/overview.md
@@ -0,0 +1,65 @@
+# JDA-Commands
+
+### A declarative, annotation driven interaction framework for JDA.
+
+---
+
+## Resources
+
+This is the official documentation for jda-commands. If you are new to jda-commands
+(or [JDA](https://jda.wiki/introduction/jda/) in general) you might also find the following resources helpful:
+
+- [JDA-Commands Wiki](https://github.com/Kaktushose/jda-commands/wiki)
+- [Release Notes](https://github.com/Kaktushose/jda-commands/releases)
+- [JDA Wiki](https://jda.wiki/)
+
+Having trouble or found a bug?
+
+- Check out the [Examples](https://github.com/Kaktushose/jda-commands/tree/main/src/examples)
+- Join the [Discord Server](https://discord.gg/JYWezvQ)
+- Or open an [Issue](https://github.com/Kaktushose/jda-commands/issues)
+
+## Example usage
+### 1. Create JDACommands instance and start framework
+```java
+public class Main {
+    
+    public static void main(String[] args) {
+        JDA jda = yourJDABuilding();
+        JDACommands jdaCommands = JDACommands.start(jda, Main.class);
+    }
+    
+}
+```
+
+### 2. Create interaction class
+
+```java
+@Interaction
+public class HelloWorld { 
+    
+    @SlashCommand("greet") 
+    public void onCommand(CommandEvent event) {
+        event.reply("Hello World!");
+    }
+    
+}
+```
+
+
+## Runtime Concept
+
+One of the core concepts in jda-commands is the so-called `Runtime`. It is mentioned frequently in the docs. A `Runtime` delegates the jda events to their corresponding `EventHandlers` and manages the used virtual threads.
+
+A new `Runtime` is created each time a [`SlashCommandInteractionEvent`](https://javadoc.io/doc/net.dv8tion/JDA/latest/net/dv8tion/jda/api/events/interaction/command/SlashCommandInteractionEvent.html),
+[`GenericContextInteractionEvent`](https://javadoc.io/doc/net.dv8tion/JDA/latest/net/dv8tion/jda/api/events/interaction/command/GenericContextInteractionEvent.html)
+or [`CommandAutoCompleteInteractionEvent`](https://javadoc.io/doc/net.dv8tion/JDA/latest/net/dv8tion/jda/api/events/interaction/command/CommandAutoCompleteInteractionEvent.html) is provided by jda
+or if an interaction is marked as [*independent*](jda.commands/com/github/kaktushose/jda/commands/dispatching/reply/Component.html#independent(java.lang.String...)).
+
+Runtimes are executed in parallel, but events are processed sequentially by each runtime.
+Every `EventHandler` called by this `Runtime` is executed in its own virtual thread, isolated from the runtime one.
+
+See [`ExpirationStrategy`](jda.commands/com/github/kaktushose/jda/commands/dispatching/ExpirationStrategy.html) for
+details when a `Runtime` will close.
+
+<img src="doc-files/flowchart.png" alt="event/runtime flowchart" class="resizable-image" width="1000"/>
diff --git a/src/test/java/adapting/CustomTypeAdapter.java b/src/test/java/adapting/CustomTypeAdapter.java
index cabfc90f5..36318f70f 100644
--- a/src/test/java/adapting/CustomTypeAdapter.java
+++ b/src/test/java/adapting/CustomTypeAdapter.java
@@ -1,15 +1,16 @@
 package adapting;
 
-import com.github.kaktushose.jda.commands.dispatching.interactions.Context;
 import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapter;
+import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Optional;
 
 public class CustomTypeAdapter implements TypeAdapter<CustomType> {
 
+
     @Override
-    public Optional<CustomType> apply(@NotNull String raw, @NotNull Context context) {
+    public @NotNull Optional<CustomType> apply(@NotNull String raw, @NotNull GenericInteractionCreateEvent event) {
         return Optional.of(new CustomType());
     }
 }
diff --git a/src/test/java/adapting/TypeAdapterRegistryTest.java b/src/test/java/adapting/TypeAdapterRegistryTest.java
index 9f23c24ef..783eea028 100644
--- a/src/test/java/adapting/TypeAdapterRegistryTest.java
+++ b/src/test/java/adapting/TypeAdapterRegistryTest.java
@@ -1,176 +1,171 @@
-package adapting;
-
-import adapting.mock.SlashCommandInteractionEventMock;
-import adapting.mock.TypeAdapterRegistryTestController;
-import com.github.kaktushose.jda.commands.annotations.interactions.Interaction;
-import com.github.kaktushose.jda.commands.dependency.DefaultDependencyInjector;
-import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapterRegistry;
-import com.github.kaktushose.jda.commands.dispatching.adapter.impl.IntegerAdapter;
-import com.github.kaktushose.jda.commands.dispatching.interactions.commands.CommandEvent;
-import com.github.kaktushose.jda.commands.dispatching.interactions.commands.SlashCommandContext;
-import com.github.kaktushose.jda.commands.dispatching.middleware.MiddlewareRegistry;
-import com.github.kaktushose.jda.commands.dispatching.validation.ValidatorRegistry;
-import com.github.kaktushose.jda.commands.reflect.CooldownDefinition;
-import com.github.kaktushose.jda.commands.reflect.ImplementationRegistry;
-import com.github.kaktushose.jda.commands.reflect.InteractionRegistry;
-import com.github.kaktushose.jda.commands.reflect.MethodBuildContext;
-import com.github.kaktushose.jda.commands.reflect.interactions.commands.SlashCommandDefinition;
-import net.dv8tion.jda.api.interactions.commands.localization.ResourceBundleLocalizationFunction;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import java.lang.reflect.Method;
-import java.util.Set;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-public class TypeAdapterRegistryTest {
-
-    private static Class<?> controller;
-    private static ValidatorRegistry validator;
-    private static TypeAdapterRegistry adapter;
-    private TypeAdapterRegistry registry;
-
-    @BeforeAll
-    public static void setup() {
-        TypeAdapterRegistryTestController instance = new TypeAdapterRegistryTestController();
-        controller = instance.getClass();
-        validator = new ValidatorRegistry();
-        adapter = new TypeAdapterRegistry();
-    }
-
-    @BeforeEach
-    public void cleanup() {
-        registry = new TypeAdapterRegistry();
-    }
-
-    @Test
-    public void register_withNewTypeAndNewAdapter_ShouldAdd() {
-        registry = new TypeAdapterRegistry();
-        registry.register(CustomType.class, new CustomTypeAdapter());
-
-        assertTrue(registry.exists(CustomType.class));
-    }
-
-    @Test
-    public void register_withExistingTypeAndNewAdapter_ShouldOverride() {
-        registry = new TypeAdapterRegistry();
-        CustomTypeAdapter adapter = new CustomTypeAdapter();
-
-        assertEquals(IntegerAdapter.class, registry.get(Integer.class).get().getClass());
-        registry.register(Integer.class, adapter);
-
-        assertEquals(adapter, registry.get(Integer.class).orElse(null));
-    }
-
-    @Test
-    public void unregister_withExistingType_ShouldRemove() {
-        registry = new TypeAdapterRegistry();
-
-        assertTrue(registry.exists(Integer.class));
-        registry.unregister(Integer.class);
-
-        assertFalse(registry.exists(Integer.class));
-    }
-
-    @Test
-    public void adapt_withStringArray_ShouldNotAdapt() throws NoSuchMethodException {
-        SlashCommandContext context = buildContext(buildCommand("stringArray", CommandEvent.class, String[].class), "a", "b", "c");
-
-        registry.adapt(context);
-
-        assertArrayEquals(new String[]{"a", "b", "c"}, (String[]) context.getArguments().getFirst());
-    }
-
-    @Test
-    public void adapt_withLessInputThanParameters_ShouldThrow() throws NoSuchMethodException {
-        SlashCommandContext context = buildContext(buildCommand("inputLength", CommandEvent.class, int.class));
-
-        assertThrows(IllegalStateException.class, () -> registry.adapt(context));
-    }
-
-    @Test
-    public void adapt_withMoreInputThanParameters_ShouldNotCancel() throws NoSuchMethodException {
-        SlashCommandContext context = buildContext(buildCommand("inputLength", CommandEvent.class, int.class), "1", "2");
-
-        registry.adapt(context);
-
-        assertFalse(context.isCancelled());
-    }
-
-    @Test
-    public void adapt_withOptionalWithDefaultNull_ShouldAddNull() throws NoSuchMethodException {
-        SlashCommandContext context = buildContext(buildCommand("optionalNull", CommandEvent.class, int.class));
-
-        registry.adapt(context);
-
-        assertNull(context.getArguments().getFirst());
-    }
-
-    @Test
-    public void adapt_withOptionalWithDefault_ShouldAddDefault() throws NoSuchMethodException {
-        SlashCommandContext context = buildContext(buildCommand("optionalDefault", CommandEvent.class, String.class));
-
-        registry.adapt(context);
-
-        assertEquals(TypeAdapterRegistryTestController.OPTIONAL_DEFAULT, context.getArguments().getFirst());
-    }
-
-    @Test
-    public void adapt_withMissingTypeAdapter_ShouldThrowIllegalArgumentException() throws NoSuchMethodException {
-        adapter.register(CustomType.class, new CustomTypeAdapter());
-        SlashCommandContext context = buildContext(buildCommand("noAdapter", CommandEvent.class, CustomType.class), "string");
-        adapter.unregister(CustomType.class);
-
-        assertThrows(IllegalArgumentException.class, () -> registry.adapt(context));
-    }
-
-    @Test
-    public void adapt_withWrongArgument_ShouldCancel() throws NoSuchMethodException {
-        SlashCommandContext context = buildContext(buildCommand("wrongArgument", CommandEvent.class, int.class), "string");
-
-        registry.adapt(context);
-        assertTrue(context.isCancelled());
-    }
-
-    private SlashCommandDefinition buildCommand(String name, Class<?>... parameterTypes) throws NoSuchMethodException {
-        Method method = controller.getMethod(name, parameterTypes);
-        SlashCommandDefinition command = SlashCommandDefinition.build(new MethodBuildContext(
-                validator,
-                ResourceBundleLocalizationFunction.empty().build(),
-                controller.getAnnotation(Interaction.class),
-                Set.of(),
-                CooldownDefinition.build(null),
-                method,
-                Set.of()
-        )).orElse(null);
-        assertNotNull(command);
-        return command;
-    }
-
-    public static SlashCommandContext buildContext(SlashCommandDefinition command, String... input) {
-        SlashCommandContext context = new SlashCommandContext(
-                new SlashCommandInteractionEventMock(),
-                new InteractionRegistry(
-                        new ValidatorRegistry(),
-                        new DefaultDependencyInjector(),
-                        ResourceBundleLocalizationFunction.empty().build()
-                ),
-                new ImplementationRegistry(
-                        new DefaultDependencyInjector(),
-                        new MiddlewareRegistry(),
-                        new TypeAdapterRegistry(),
-                        new ValidatorRegistry()
-                )
-        );
-        context.setInput(input);
-        context.setCommand(command);
-        return context;
-    }
-
-    private <T> T giveNull() {
-        return null;
-    }
-
-}
+//package adapting;
+//
+//import adapting.mock.SlashCommandInteractionEventMock;
+//import adapting.mock.TypeAdapterRegistryTestController;
+//import com.github.kaktushose.jda.commands.annotations.interactions.Interaction;
+//import com.github.kaktushose.jda.commands.dependency.DefaultDependencyInjector;
+//import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapterRegistry;
+//import com.github.kaktushose.jda.commands.dispatching.adapter.impl.IntegerAdapter;
+//import com.github.kaktushose.jda.commands.dispatching.events.interactions.CommandEvent;
+//import com.github.kaktushose.jda.commands.dispatching.middleware.MiddlewareRegistry;
+//import com.github.kaktushose.jda.commands.dispatching.validation.ValidatorRegistry;
+//import com.github.kaktushose.jda.commands.reflect.CooldownDefinition;
+//import com.github.kaktushose.jda.commands.reflect.ImplementationRegistry;
+//import com.github.kaktushose.jda.commands.reflect.InteractionRegistry;
+//import com.github.kaktushose.jda.commands.reflect.MethodBuildContext;
+//import com.github.kaktushose.jda.commands.reflect.interactions.commands.SlashCommandDefinition;
+//import net.dv8tion.jda.api.interactions.commands.localization.ResourceBundleLocalizationFunction;
+//import org.junit.jupiter.api.BeforeAll;
+//import org.junit.jupiter.api.BeforeEach;
+//import org.junit.jupiter.api.Test;
+//
+//import java.lang.reflect.Method;
+//import java.util.Set;
+//
+//import static org.junit.jupiter.api.Assertions.*;
+//
+//public class TypeAdapterRegistryTest {
+//
+//    private static Class<?> controller;
+//    private static ValidatorRegistry validator;
+//    private static TypeAdapterRegistry adapter;
+//    private TypeAdapterRegistry registry;
+//
+//    @BeforeAll
+//    public static void setup() {
+//        TypeAdapterRegistryTestController instance = new TypeAdapterRegistryTestController();
+//        controller = instance.getClass();
+//        validator = new ValidatorRegistry();
+//        adapter = new TypeAdapterRegistry();
+//    }
+//
+//    @BeforeEach
+//    public void cleanup() {
+//        registry = new TypeAdapterRegistry();
+//    }
+//
+//    @Test
+//    public void register_withNewTypeAndNewAdapter_ShouldAdd() {
+//        registry = new TypeAdapterRegistry();
+//        registry.register(CustomType.class, new CustomTypeAdapter());
+//
+//        assertTrue(registry.exists(CustomType.class));
+//    }
+//
+//    @Test
+//    public void register_withExistingTypeAndNewAdapter_ShouldOverride() {
+//        registry = new TypeAdapterRegistry();
+//        CustomTypeAdapter adapter = new CustomTypeAdapter();
+//
+//        assertEquals(IntegerAdapter.class, registry.get(Integer.class).get().getClass());
+//        registry.register(Integer.class, adapter);
+//
+//        assertEquals(adapter, registry.get(Integer.class).orElse(null));
+//    }
+//
+//    @Test
+//    public void unregister_withExistingType_ShouldRemove() {
+//        registry = new TypeAdapterRegistry();
+//
+//        assertTrue(registry.exists(Integer.class));
+//        registry.unregister(Integer.class);
+//
+//        assertFalse(registry.exists(Integer.class));
+//    }
+//
+//    @Test
+//    public void adapt_withStringArray_ShouldNotAdapt() throws NoSuchMethodException {
+//        SlashCommandContext context = buildContext(buildCommand("stringArray", CommandEvent.class, String[].class), "a", "b", "c");
+//
+//        registry.adapt(context);
+//
+//        assertArrayEquals(new String[]{"a", "b", "c"}, (String[]) context.getArguments().getFirst());
+//    }
+//
+//    @Test
+//    public void adapt_withLessInputThanParameters_ShouldThrow() throws NoSuchMethodException {
+//        SlashCommandContext context = buildContext(buildCommand("inputLength", CommandEvent.class, int.class));
+//
+//        assertThrows(IllegalStateException.class, () -> registry.adapt(context));
+//    }
+//
+//    @Test
+//    public void adapt_withMoreInputThanParameters_ShouldNotCancel() throws NoSuchMethodException {
+//        SlashCommandContext context = buildContext(buildCommand("inputLength", CommandEvent.class, int.class), "1", "2");
+//
+//        registry.adapt(context);
+//
+//        assertFalse(context.isCancelled());
+//    }
+//
+//    @Test
+//    public void adapt_withOptionalWithDefaultNull_ShouldAddNull() throws NoSuchMethodException {
+//        SlashCommandContext context = buildContext(buildCommand("optionalNull", CommandEvent.class, int.class));
+//
+//        registry.adapt(context);
+//
+//        assertNull(context.getArguments().getFirst());
+//    }
+//
+//    @Test
+//    public void adapt_withOptionalWithDefault_ShouldAddDefault() throws NoSuchMethodException {
+//        SlashCommandContext context = buildContext(buildCommand("optionalDefault", CommandEvent.class, String.class));
+//
+//        registry.adapt(context);
+//
+//        assertEquals(TypeAdapterRegistryTestController.OPTIONAL_DEFAULT, context.getArguments().getFirst());
+//    }
+//
+//    @Test
+//    public void adapt_withMissingTypeAdapter_ShouldThrowIllegalArgumentException() throws NoSuchMethodException {
+//        adapter.register(CustomType.class, new CustomTypeAdapter());
+//        SlashCommandContext context = buildContext(buildCommand("noAdapter", CommandEvent.class, CustomType.class), "string");
+//        adapter.unregister(CustomType.class);
+//
+//        assertThrows(IllegalArgumentException.class, () -> registry.adapt(context));
+//    }
+//
+//    @Test
+//    public void adapt_withWrongArgument_ShouldCancel() throws NoSuchMethodException {
+//        SlashCommandContext context = buildContext(buildCommand("wrongArgument", CommandEvent.class, int.class), "string");
+//
+//        registry.(context);
+//        assertTrue(context.isCancelled());
+//    }
+//
+//    private SlashCommandDefinition buildCommand(String name, Class<?>... parameterTypes) throws NoSuchMethodException {
+//        Method method = controller.getMethod(name, parameterTypes);
+//        SlashCommandDefinition command = SlashCommandDefinition.build(new MethodBuildContext(
+//                validator,
+//                ResourceBundleLocalizationFunction.empty().build(),
+//                controller.getAnnotation(Interaction.class),
+//                Set.of(),
+//                CooldownDefinition.build(null),
+//                method,
+//                Set.of()
+//        )).orElse(null);
+//        assertNotNull(command);
+//        return command;
+//    }
+//
+//    public static SlashCommandContext buildContext(SlashCommandDefinition command, String... input) {
+//        SlashCommandContext context = new SlashCommandContext(
+//                new SlashCommandInteractionEventMock(),
+//                new InteractionRegistry(
+//                        new ValidatorRegistry(),
+//                        new DefaultDependencyInjector(),
+//                        ResourceBundleLocalizationFunction.empty().build()
+//                ),
+//                new ImplementationRegistry(
+//                        new DefaultDependencyInjector(),
+//                        new MiddlewareRegistry(),
+//                        new TypeAdapterRegistry(),
+//                        new ValidatorRegistry()
+//                )
+//        );
+//        context.setInput(input);
+//        context.setCommand(command);
+//        return context;
+//    }
+//
+//}
diff --git a/src/test/java/adapting/TypeAdapterTest.java b/src/test/java/adapting/TypeAdapterTest.java
index ace397e3b..f597916de 100644
--- a/src/test/java/adapting/TypeAdapterTest.java
+++ b/src/test/java/adapting/TypeAdapterTest.java
@@ -2,9 +2,10 @@
 
 import adapting.mock.GuildMock;
 import adapting.mock.JDAMock;
-import com.github.kaktushose.jda.commands.Helpers;
+import adapting.mock.SlashCommandInteractionEventMock;
+import com.github.kaktushose.jda.commands.internal.Helpers;
 import com.github.kaktushose.jda.commands.dispatching.adapter.impl.*;
-import com.github.kaktushose.jda.commands.dispatching.interactions.commands.SlashCommandContext;
+import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
@@ -12,291 +13,291 @@
 
 public class TypeAdapterTest {
 
-    private static SlashCommandContext context;
+    private static GenericInteractionCreateEvent event;
 
     @BeforeAll
     public static void setup() {
-        context = TypeAdapterRegistryTest.buildContext(null, "");
+        event = new SlashCommandInteractionEventMock();
     }
 
     @Test
     public void booleanAdapter_withZero_ShouldReturnFalse() {
         BooleanAdapter adapter = new BooleanAdapter();
 
-        assertFalse(adapter.apply("0", context).orElse(true));
+        assertFalse(adapter.apply("0", event).orElse(true));
     }
 
     @Test
     public void booleanAdapter_withFalse_ShouldReturnFalse() {
         BooleanAdapter adapter = new BooleanAdapter();
 
-        assertFalse(adapter.apply("False", context).orElse(true));
-        assertFalse(adapter.apply("false", context).orElse(true));
-        assertFalse(adapter.apply("fAlSe", context).orElse(true));
+        assertFalse(adapter.apply("False", event).orElse(true));
+        assertFalse(adapter.apply("false", event).orElse(true));
+        assertFalse(adapter.apply("fAlSe", event).orElse(true));
     }
 
     @Test
     public void booleanAdapter_withOne_ShouldReturnTrue() {
         BooleanAdapter adapter = new BooleanAdapter();
 
-        assertTrue(adapter.apply("1", context).orElse(false));
+        assertTrue(adapter.apply("1", event).orElse(false));
     }
 
     @Test
     public void booleanAdapter_withTrue_ShouldReturnTrue() {
         BooleanAdapter adapter = new BooleanAdapter();
 
-        assertTrue(adapter.apply("True", context).orElse(false));
-        assertTrue(adapter.apply("true", context).orElse(false));
-        assertTrue(adapter.apply("tRuE", context).orElse(false));
+        assertTrue(adapter.apply("True", event).orElse(false));
+        assertTrue(adapter.apply("true", event).orElse(false));
+        assertTrue(adapter.apply("tRuE", event).orElse(false));
     }
 
     @Test
     public void booleanAdapter_withNonBoolean_ShouldBeEmpty() {
         BooleanAdapter adapter = new BooleanAdapter();
 
-        assertFalse(adapter.apply("text", context).isPresent());
+        assertFalse(adapter.apply("text", event).isPresent());
     }
 
     @Test
     public void byteAdapter_withNumber_ShouldBePresent() {
         ByteAdapter adapter = new ByteAdapter();
 
-        assertEquals(Byte.MIN_VALUE, adapter.apply(String.valueOf(Byte.MIN_VALUE), context).orElseThrow());
-        assertEquals(Byte.MAX_VALUE, adapter.apply(String.valueOf(Byte.MAX_VALUE), context).orElseThrow());
+        assertEquals(Byte.MIN_VALUE, adapter.apply(String.valueOf(Byte.MIN_VALUE), event).orElseThrow());
+        assertEquals(Byte.MAX_VALUE, adapter.apply(String.valueOf(Byte.MAX_VALUE), event).orElseThrow());
     }
 
     @Test
     public void byteAdapter_withNonNumeric_ShouldBeEmpty() {
         ByteAdapter adapter = new ByteAdapter();
 
-        assertFalse(adapter.apply("text", context).isPresent());
+        assertFalse(adapter.apply("text", event).isPresent());
     }
 
     @Test
     public void characterAdapter_withOneChar_ShouldBePresent() {
         CharacterAdapter adapter = new CharacterAdapter();
 
-        assertTrue(adapter.apply("c", context).isPresent());
+        assertTrue(adapter.apply("c", event).isPresent());
     }
 
     @Test
     public void characterAdapter_withMultipleChars_ShouldBeEmpty() {
         CharacterAdapter adapter = new CharacterAdapter();
 
-        assertFalse(adapter.apply("chars", context).isPresent());
+        assertFalse(adapter.apply("chars", event).isPresent());
     }
 
     @Test
     public void doubleAdapter_withNumber_ShouldReturnDouble() {
         DoubleAdapter adapter = new DoubleAdapter();
 
-        assertEquals(Double.MIN_VALUE, adapter.apply(String.valueOf(Double.MIN_VALUE), context).orElseThrow());
-        assertEquals(Double.MIN_EXPONENT, adapter.apply(String.valueOf(Double.MIN_EXPONENT), context).orElseThrow());
-        assertEquals(Double.MAX_VALUE, adapter.apply(String.valueOf(Double.MAX_VALUE), context).orElseThrow());
-        assertEquals(Double.MAX_EXPONENT, adapter.apply(String.valueOf(Double.MAX_EXPONENT), context).orElseThrow());
+        assertEquals(Double.MIN_VALUE, adapter.apply(String.valueOf(Double.MIN_VALUE), event).orElseThrow());
+        assertEquals(Double.MIN_EXPONENT, adapter.apply(String.valueOf(Double.MIN_EXPONENT), event).orElseThrow());
+        assertEquals(Double.MAX_VALUE, adapter.apply(String.valueOf(Double.MAX_VALUE), event).orElseThrow());
+        assertEquals(Double.MAX_EXPONENT, adapter.apply(String.valueOf(Double.MAX_EXPONENT), event).orElseThrow());
     }
 
     @Test
     public void doubleAdapter_withNonNumeric_ShouldBeEmpty() {
         DoubleAdapter adapter = new DoubleAdapter();
 
-        assertFalse(adapter.apply("text", context).isPresent());
+        assertFalse(adapter.apply("text", event).isPresent());
     }
 
     @Test
     public void floatAdapter_withNumber_ShouldReturnDouble() {
         FloatAdapter adapter = new FloatAdapter();
 
-        assertEquals(Float.MIN_VALUE, adapter.apply(String.valueOf(Float.MIN_VALUE), context).orElseThrow());
-        assertEquals(Float.MIN_EXPONENT, adapter.apply(String.valueOf(Float.MIN_EXPONENT), context).orElseThrow());
-        assertEquals(Float.MAX_VALUE, adapter.apply(String.valueOf(Float.MAX_VALUE), context).orElseThrow());
-        assertEquals(Float.MAX_EXPONENT, adapter.apply(String.valueOf(Float.MAX_EXPONENT), context).orElseThrow());
+        assertEquals(Float.MIN_VALUE, adapter.apply(String.valueOf(Float.MIN_VALUE), event).orElseThrow());
+        assertEquals(Float.MIN_EXPONENT, adapter.apply(String.valueOf(Float.MIN_EXPONENT), event).orElseThrow());
+        assertEquals(Float.MAX_VALUE, adapter.apply(String.valueOf(Float.MAX_VALUE), event).orElseThrow());
+        assertEquals(Float.MAX_EXPONENT, adapter.apply(String.valueOf(Float.MAX_EXPONENT), event).orElseThrow());
     }
 
     @Test
     public void floatAdapter_withNonNumeric_ShouldBeEmpty() {
         FloatAdapter adapter = new FloatAdapter();
 
-        assertFalse(adapter.apply("text", context).isPresent());
+        assertFalse(adapter.apply("text", event).isPresent());
     }
 
     @Test
     public void integerAdapter_withNumber_ShouldReturnDouble() {
         IntegerAdapter adapter = new IntegerAdapter();
 
-        assertEquals(Integer.MIN_VALUE, adapter.apply(String.valueOf(Integer.MIN_VALUE), context).orElseThrow());
-        assertEquals(Integer.MAX_VALUE, adapter.apply(String.valueOf(Integer.MAX_VALUE), context).orElseThrow());
+        assertEquals(Integer.MIN_VALUE, adapter.apply(String.valueOf(Integer.MIN_VALUE), event).orElseThrow());
+        assertEquals(Integer.MAX_VALUE, adapter.apply(String.valueOf(Integer.MAX_VALUE), event).orElseThrow());
     }
 
     @Test
     public void integerAdapter_withNonNumeric_ShouldBeEmpty() {
         IntegerAdapter adapter = new IntegerAdapter();
 
-        assertFalse(adapter.apply("text", context).isPresent());
+        assertFalse(adapter.apply("text", event).isPresent());
     }
 
     @Test
     public void longAdapter_withNumber_ShouldReturnDouble() {
         LongAdapter adapter = new LongAdapter();
 
-        assertEquals(Long.MIN_VALUE, adapter.apply(String.valueOf(Long.MIN_VALUE), context).orElseThrow());
-        assertEquals(Long.MAX_VALUE, adapter.apply(String.valueOf(Long.MAX_VALUE), context).orElseThrow());
+        assertEquals(Long.MIN_VALUE, adapter.apply(String.valueOf(Long.MIN_VALUE), event).orElseThrow());
+        assertEquals(Long.MAX_VALUE, adapter.apply(String.valueOf(Long.MAX_VALUE), event).orElseThrow());
     }
 
     @Test
     public void longAdapter_withNonNumeric_ShouldBeEmpty() {
         LongAdapter adapter = new LongAdapter();
 
-        assertFalse(adapter.apply("text", context).isPresent());
+        assertFalse(adapter.apply("text", event).isPresent());
     }
 
     @Test
     public void shortAdapter_withNumber_ShouldReturnDouble() {
         ShortAdapter adapter = new ShortAdapter();
 
-        assertEquals(Short.MIN_VALUE, adapter.apply(String.valueOf(Short.MIN_VALUE), context).orElseThrow());
-        assertEquals(Short.MAX_VALUE, adapter.apply(String.valueOf(Short.MAX_VALUE), context).orElseThrow());
+        assertEquals(Short.MIN_VALUE, adapter.apply(String.valueOf(Short.MIN_VALUE), event).orElseThrow());
+        assertEquals(Short.MAX_VALUE, adapter.apply(String.valueOf(Short.MAX_VALUE), event).orElseThrow());
     }
 
     @Test
     public void shortAdapter_withNonNumeric_ShouldBeEmpty() {
         ShortAdapter adapter = new ShortAdapter();
 
-        assertFalse(adapter.apply("text", context).isPresent());
+        assertFalse(adapter.apply("text", event).isPresent());
     }
 
     @Test
     public void adapter_withExistingId_ShouldReturnUser() {
         UserAdapter adapter = new UserAdapter();
 
-        assertEquals(JDAMock.USER, adapter.apply(String.valueOf(JDAMock.USER.getIdLong()), context).orElseThrow());
+        assertEquals(JDAMock.USER, adapter.apply(String.valueOf(JDAMock.USER.getIdLong()), event).orElseThrow());
     }
 
     @Test
     public void adapter_withNonExistingId_ShouldBeEmpty() {
         UserAdapter adapter = new UserAdapter();
 
-        assertFalse(adapter.apply("1234567890", context).isPresent());
+        assertFalse(adapter.apply("1234567890", event).isPresent());
     }
 
     @Test
     public void adapter_withExistingName_ShouldReturnUser() {
         UserAdapter adapter = new UserAdapter();
 
-        assertEquals(JDAMock.USER, adapter.apply(JDAMock.USER.getName(), context).orElseThrow());
+        assertEquals(JDAMock.USER, adapter.apply(JDAMock.USER.getName(), event).orElseThrow());
     }
 
     @Test
     public void adapter_withNonExistingName_ShouldBeEmpty() {
         UserAdapter adapter = new UserAdapter();
 
-        assertFalse(adapter.apply("thispersondoesnotexist.com", context).isPresent());
+        assertFalse(adapter.apply("thispersondoesnotexist.com", event).isPresent());
     }
 
     @Test
     public void memberAdapter_withExistingId_ShouldReturnMember() {
         MemberAdapter adapter = new MemberAdapter();
 
-        assertEquals(GuildMock.MEMBER, adapter.apply(String.valueOf(GuildMock.MEMBER.getIdLong()), context).orElseThrow());
+        assertEquals(GuildMock.MEMBER, adapter.apply(String.valueOf(GuildMock.MEMBER.getIdLong()), event).orElseThrow());
     }
 
     @Test
     public void memberAdapter_withNonExistingId_ShouldBeEmpty() {
         MemberAdapter adapter = new MemberAdapter();
 
-        assertFalse(adapter.apply("1234567890", context).isPresent());
+        assertFalse(adapter.apply("1234567890", event).isPresent());
     }
 
     @Test
     public void memberAdapter_withExistingName_ShouldReturnMember() {
         MemberAdapter adapter = new MemberAdapter();
 
-        assertEquals(GuildMock.MEMBER, adapter.apply(GuildMock.MEMBER.getNickname(), context).orElseThrow());
+        assertEquals(GuildMock.MEMBER, adapter.apply(GuildMock.MEMBER.getNickname(), event).orElseThrow());
     }
 
     @Test
     public void memberAdapter_withNonExistingName_ShouldBeEmpty() {
         MemberAdapter adapter = new MemberAdapter();
 
-        assertFalse(adapter.apply("thispersondoesnotexist.com", context).isPresent());
+        assertFalse(adapter.apply("thispersondoesnotexist.com", event).isPresent());
     }
 
     @Test
     public void memberAdapter_inNotGuildContext_ShouldBeEmpty() {
         MemberAdapter adapter = new MemberAdapter();
 
-        assertFalse(adapter.apply("name", context).isPresent());
+        assertFalse(adapter.apply("name", event).isPresent());
     }
 
     @Test
     public void roleAdapter_withExistingId_ShouldReturnMember() {
         RoleAdapter adapter = new RoleAdapter();
 
-        assertEquals(GuildMock.ROLE, adapter.apply(String.valueOf(GuildMock.ROLE.getIdLong()), context).orElseThrow());
+        assertEquals(GuildMock.ROLE, adapter.apply(String.valueOf(GuildMock.ROLE.getIdLong()), event).orElseThrow());
     }
 
     @Test
     public void roleAdapter_withNonExistingId_ShouldBeEmpty() {
         RoleAdapter adapter = new RoleAdapter();
 
-        assertFalse(adapter.apply("1234567890", context).isPresent());
+        assertFalse(adapter.apply("1234567890", event).isPresent());
     }
 
     @Test
     public void roleAdapter_withExistingName_ShouldReturnMember() {
         RoleAdapter adapter = new RoleAdapter();
 
-        assertEquals(GuildMock.ROLE, adapter.apply(GuildMock.ROLE.getName(), context).orElseThrow());
+        assertEquals(GuildMock.ROLE, adapter.apply(GuildMock.ROLE.getName(), event).orElseThrow());
     }
 
     @Test
     public void roleAdapter_withNonExistingName_ShouldBeEmpty() {
         RoleAdapter adapter = new RoleAdapter();
 
-        assertFalse(adapter.apply("thispersondoesnotexist.com", context).isPresent());
+        assertFalse(adapter.apply("thispersondoesnotexist.com", event).isPresent());
     }
 
     @Test
     public void roleAdapter_inNotGuildContext_ShouldBeEmpty() {
         RoleAdapter adapter = new RoleAdapter();
 
-        assertFalse(adapter.apply("name", context).isPresent());
+        assertFalse(adapter.apply("name", event).isPresent());
     }
 
     @Test
     public void textChannelAdapter_withExistingId_ShouldReturnMember() {
         TextChannelAdapter adapter = new TextChannelAdapter();
 
-        assertEquals(GuildMock.TEXT_CHANNEL, adapter.apply(String.valueOf(GuildMock.TEXT_CHANNEL.getIdLong()), context).orElseThrow());
+        assertEquals(GuildMock.TEXT_CHANNEL, adapter.apply(String.valueOf(GuildMock.TEXT_CHANNEL.getIdLong()), event).orElseThrow());
     }
 
     @Test
     public void textChannelAdapter_withNonExistingId_ShouldBeEmpty() {
         TextChannelAdapter adapter = new TextChannelAdapter();
 
-        assertFalse(adapter.apply("1234567890", context).isPresent());
+        assertFalse(adapter.apply("1234567890", event).isPresent());
     }
 
     @Test
     public void textChannelAdapter_withExistingName_ShouldReturnMember() {
         TextChannelAdapter adapter = new TextChannelAdapter();
 
-        assertEquals(GuildMock.TEXT_CHANNEL, adapter.apply(GuildMock.TEXT_CHANNEL.getName(), context).orElseThrow());
+        assertEquals(GuildMock.TEXT_CHANNEL, adapter.apply(GuildMock.TEXT_CHANNEL.getName(), event).orElseThrow());
     }
 
     @Test
     public void textChannelAdapter_withNonExistingName_ShouldBeEmpty() {
         TextChannelAdapter adapter = new TextChannelAdapter();
 
-        assertFalse(adapter.apply("thispersondoesnotexist.com", context).isPresent());
+        assertFalse(adapter.apply("thispersondoesnotexist.com", event).isPresent());
     }
 
     @Test
     public void textChannelAdapter_inNotGuildContext_ShouldBeEmpty() {
         TextChannelAdapter adapter = new TextChannelAdapter();
 
-        assertFalse(adapter.apply("name", context).isPresent());
+        assertFalse(adapter.apply("name", event).isPresent());
     }
 
     @Test
diff --git a/src/test/java/adapting/mock/JDACommandsMock.java b/src/test/java/adapting/mock/JDACommandsMock.java
index 052cd48c8..e5374c9fc 100644
--- a/src/test/java/adapting/mock/JDACommandsMock.java
+++ b/src/test/java/adapting/mock/JDACommandsMock.java
@@ -1,10 +1,9 @@
 package adapting.mock;
 
-import com.github.kaktushose.jda.commands.JDAContext;
-import com.github.kaktushose.jda.commands.SlashCommandUpdater;
+import com.github.kaktushose.jda.commands.internal.JDAContext;
+import com.github.kaktushose.jda.commands.internal.register.SlashCommandUpdater;
 import com.github.kaktushose.jda.commands.dependency.DependencyInjector;
-import com.github.kaktushose.jda.commands.dispatching.DispatcherSupervisor;
-import com.github.kaktushose.jda.commands.dispatching.RuntimeSupervisor;
+import com.github.kaktushose.jda.commands.dispatching.internal.JDAEventListener;
 import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapterRegistry;
 import com.github.kaktushose.jda.commands.dispatching.middleware.MiddlewareRegistry;
 import com.github.kaktushose.jda.commands.dispatching.validation.ValidatorRegistry;
@@ -13,13 +12,11 @@
 
 public record JDACommandsMock(
         JDAContext jdaContext,
-        DispatcherSupervisor dispatcherSupervisor,
+        JDAEventListener JDAEventListener,
         MiddlewareRegistry middlewareRegistry,
         TypeAdapterRegistry adapterRegistry,
         ValidatorRegistry validatorRegistry,
         DependencyInjector dependencyInjector,
         InteractionRegistry interactionRegistry,
-        SlashCommandUpdater updater,
-        RuntimeSupervisor runtimeSupervisor
-) {
+        SlashCommandUpdater updater) {
 }
diff --git a/src/test/java/adapting/mock/TypeAdapterRegistryTestController.java b/src/test/java/adapting/mock/TypeAdapterRegistryTestController.java
index e237d74a7..175832c6b 100644
--- a/src/test/java/adapting/mock/TypeAdapterRegistryTestController.java
+++ b/src/test/java/adapting/mock/TypeAdapterRegistryTestController.java
@@ -4,7 +4,7 @@
 import com.github.kaktushose.jda.commands.annotations.interactions.Interaction;
 import com.github.kaktushose.jda.commands.annotations.interactions.SlashCommand;
 import com.github.kaktushose.jda.commands.annotations.interactions.Optional;
-import com.github.kaktushose.jda.commands.dispatching.interactions.commands.CommandEvent;
+import com.github.kaktushose.jda.commands.dispatching.events.interactions.CommandEvent;
 
 @Interaction
 public class TypeAdapterRegistryTestController {
diff --git a/src/test/java/commands/CommandDefinitionTestController.java b/src/test/java/commands/CommandDefinitionTestController.java
index ed1ac08c6..443a10c49 100644
--- a/src/test/java/commands/CommandDefinitionTestController.java
+++ b/src/test/java/commands/CommandDefinitionTestController.java
@@ -1,7 +1,7 @@
 package commands;
 
 import com.github.kaktushose.jda.commands.annotations.interactions.*;
-import com.github.kaktushose.jda.commands.dispatching.interactions.commands.CommandEvent;
+import com.github.kaktushose.jda.commands.dispatching.events.interactions.CommandEvent;
 
 import java.util.concurrent.TimeUnit;
 
diff --git a/src/test/java/commands/SlashCommandDefinitionTest.java b/src/test/java/commands/SlashCommandDefinitionTest.java
index eab854146..f976a8f0c 100644
--- a/src/test/java/commands/SlashCommandDefinitionTest.java
+++ b/src/test/java/commands/SlashCommandDefinitionTest.java
@@ -2,7 +2,7 @@
 
 import com.github.kaktushose.jda.commands.annotations.interactions.Interaction;
 import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapterRegistry;
-import com.github.kaktushose.jda.commands.dispatching.interactions.commands.CommandEvent;
+import com.github.kaktushose.jda.commands.dispatching.events.interactions.CommandEvent;
 import com.github.kaktushose.jda.commands.dispatching.validation.ValidatorRegistry;
 import com.github.kaktushose.jda.commands.reflect.CooldownDefinition;
 import com.github.kaktushose.jda.commands.reflect.MethodBuildContext;
diff --git a/src/test/java/controller/ControllerDefinitionTestController.java b/src/test/java/controller/ControllerDefinitionTestController.java
index d098e90fe..472ce9fc7 100644
--- a/src/test/java/controller/ControllerDefinitionTestController.java
+++ b/src/test/java/controller/ControllerDefinitionTestController.java
@@ -4,7 +4,7 @@
 import com.github.kaktushose.jda.commands.annotations.interactions.SlashCommand;
 import com.github.kaktushose.jda.commands.annotations.interactions.Cooldown;
 import com.github.kaktushose.jda.commands.annotations.interactions.Permissions;
-import com.github.kaktushose.jda.commands.dispatching.interactions.commands.CommandEvent;
+import com.github.kaktushose.jda.commands.dispatching.events.interactions.CommandEvent;
 
 import java.util.concurrent.TimeUnit;
 
diff --git a/src/test/java/controller/InteractionControllerDefinitionTest.java b/src/test/java/controller/InteractionControllerDefinitionTest.java
index 98346f961..09c6f4738 100644
--- a/src/test/java/controller/InteractionControllerDefinitionTest.java
+++ b/src/test/java/controller/InteractionControllerDefinitionTest.java
@@ -2,7 +2,7 @@
 
 import com.github.kaktushose.jda.commands.dependency.DefaultDependencyInjector;
 import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapterRegistry;
-import com.github.kaktushose.jda.commands.dispatching.interactions.commands.CommandEvent;
+import com.github.kaktushose.jda.commands.dispatching.events.interactions.CommandEvent;
 import com.github.kaktushose.jda.commands.dispatching.validation.ValidatorRegistry;
 import com.github.kaktushose.jda.commands.reflect.InteractionControllerDefinition;
 import com.github.kaktushose.jda.commands.reflect.interactions.commands.SlashCommandDefinition;
diff --git a/src/test/java/reply/CustomController.java b/src/test/java/reply/CustomController.java
new file mode 100644
index 000000000..d3ed6aa70
--- /dev/null
+++ b/src/test/java/reply/CustomController.java
@@ -0,0 +1,29 @@
+package reply;
+
+import com.github.kaktushose.jda.commands.annotations.interactions.Button;
+import com.github.kaktushose.jda.commands.annotations.interactions.Interaction;
+import com.github.kaktushose.jda.commands.annotations.interactions.ReplyConfig;
+import com.github.kaktushose.jda.commands.dispatching.events.interactions.ComponentEvent;
+
+@Interaction
+@ReplyConfig(ephemeral = true, editReply = false, keepComponents = false)
+public class CustomController {
+
+    @Button
+    public void defaultValues(ComponentEvent event) {
+
+    }
+
+    @Button
+    @ReplyConfig(ephemeral = true, editReply = false, keepComponents = false)
+    public void sameValues(ComponentEvent event) {
+
+    }
+
+    @Button
+    @ReplyConfig
+    public void customValues(ComponentEvent event) {
+
+    }
+
+}
\ No newline at end of file
diff --git a/src/test/java/reply/DefaultController.java b/src/test/java/reply/DefaultController.java
new file mode 100644
index 000000000..d6b561a78
--- /dev/null
+++ b/src/test/java/reply/DefaultController.java
@@ -0,0 +1,21 @@
+package reply;
+
+import com.github.kaktushose.jda.commands.annotations.interactions.Button;
+import com.github.kaktushose.jda.commands.annotations.interactions.Interaction;
+import com.github.kaktushose.jda.commands.annotations.interactions.ReplyConfig;
+import com.github.kaktushose.jda.commands.dispatching.events.interactions.ComponentEvent;
+
+@Interaction
+public class DefaultController {
+
+    @Button
+    public void defaultValues(ComponentEvent event) {
+
+    }
+
+    @Button
+    @ReplyConfig(ephemeral = true, editReply = false, keepComponents = false)
+    public void customValues(ComponentEvent event) {
+
+    }
+}
diff --git a/src/test/java/reply/ReplyConfigTest.java b/src/test/java/reply/ReplyConfigTest.java
new file mode 100644
index 000000000..5ea237dc5
--- /dev/null
+++ b/src/test/java/reply/ReplyConfigTest.java
@@ -0,0 +1,68 @@
+package reply;
+
+import com.github.kaktushose.jda.commands.internal.Helpers;
+import com.github.kaktushose.jda.commands.dispatching.events.interactions.ComponentEvent;
+import com.github.kaktushose.jda.commands.dispatching.reply.GlobalReplyConfig;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+public class ReplyConfigTest {
+
+    private static Class<?> defaultController;
+    private static Class<?> customController;
+
+    @BeforeAll
+    public static void setup() {
+        defaultController = DefaultController.class;
+        customController = CustomController.class;
+    }
+
+    @Test
+    public void defaultController_withDefaultMethod_ShouldUseGlobalValues() throws NoSuchMethodException {
+        var config = Helpers.replyConfig(defaultController.getDeclaredMethod("defaultValues", ComponentEvent.class));
+
+        assertEquals(config.ephemeral(), GlobalReplyConfig.ephemeral);
+        assertEquals(config.editReply(), GlobalReplyConfig.editReply);
+        assertEquals(config.keepComponents(), GlobalReplyConfig.keepComponents);
+    }
+
+    @Test
+    public void defaultController_withCustomMethod_ShouldUseMethodValues() throws NoSuchMethodException {
+        var config = Helpers.replyConfig(defaultController.getDeclaredMethod("customValues", ComponentEvent.class));
+
+        assertTrue(config.ephemeral());
+        assertFalse(config.editReply());
+        assertFalse(config.keepComponents());
+    }
+
+    @Test
+    public void customController_withDefaultMethod_ShouldUseControllerValues() throws NoSuchMethodException {
+        var config = Helpers.replyConfig(customController.getDeclaredMethod("defaultValues", ComponentEvent.class));
+
+        assertTrue(config.ephemeral());
+        assertFalse(config.editReply());
+        assertFalse(config.keepComponents());
+    }
+
+    @Test
+    public void customController_withSameCustomMethod_ShouldBeEquals() throws NoSuchMethodException {
+        var first = Helpers.replyConfig(customController.getDeclaredMethod("defaultValues", ComponentEvent.class));
+        var second = Helpers.replyConfig(customController.getDeclaredMethod("sameValues", ComponentEvent.class));
+
+        assertEquals(first.ephemeral(), second.ephemeral());
+        assertEquals(first.editReply(), second.editReply());
+        assertEquals(first.keepComponents(), second.keepComponents());
+    }
+
+    @Test
+    public void customController_withDifferentCustomMethod_ShouldUseMethodValues() throws NoSuchMethodException {
+        var config = Helpers.replyConfig(customController.getDeclaredMethod("customValues", ComponentEvent.class));
+
+        assertFalse(config.ephemeral());
+        assertTrue(config.editReply());
+        assertTrue(config.keepComponents());
+    }
+
+}

From 2fba5411cd7b658a170ab9b0b5cb04c02e11d9c4 Mon Sep 17 00:00:00 2001
From: Finn | Sachsenspielt <finn-margraf@tutanota.de>
Date: Thu, 26 Dec 2024 13:08:29 +0100
Subject: [PATCH 14/38] Update coverage.yml to use java 23 (#151)

---
 .github/workflows/coverage.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
index 77d8a4f41..587533b07 100644
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -10,10 +10,11 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
+      - name: Set up JDK 23
+        uses: actions/setup-java@v4
         with:
-          java-version: 11
+          distribution: 'temurin'
+          java-version: '23'
       - name: Run Tests
         run: mvn -B test
       - name: Run codacy-coverage-reporter

From 5da6f49e7fb67a92de765938c0a96c6978a66900 Mon Sep 17 00:00:00 2001
From: Nick Hensel <47005420+Goldmensch@users.noreply.github.com>
Date: Sun, 5 Jan 2025 14:50:03 +0100
Subject: [PATCH 15/38] Refactor definition building (#149)

* first pass on new definition api

* make interaction interfaces records and first pass on new registry

* update records

* fix invocation context

* add missing parameter methods

* rename

* add reflection wrapper

* add reflective descriptor

* update definitions

* update definitions

* fix shit ton of compile errors

* cleanup

* formatting

* remove since tag

* update documentation

* fix unit tests

* extract reflections out of InteractionRegistry

* Use Iterable instead of List and introduce CustomId#independent

* Restructure Definitions package and separate Context and SlashCommand

* remove Permissions feature interface

* Forbid Definition#invoke by user and fix bug in CustomID

* javadocs

* Yeah..

* docs

* more javadoc

* formatting

* fix java tests

* fix java tests

* fix wrong annotation

* fix codacy

* small changes

---------

Co-authored-by: Kaktushose <42280757+Kaktushose@users.noreply.github.com>
Co-authored-by: Kaktushose <faulie50@gmail.com>
---
 pom.xml                                       |  17 ++
 .../kaktushose/jda/commands/JDACommands.java  |  57 ++--
 .../commands/annotations/Implementation.java  |  52 ++--
 .../jda/commands/annotations/Inject.java      |  13 +-
 .../jda/commands/annotations/Produces.java    |  51 ++--
 .../annotations/constraints/Constraint.java   |  19 +-
 .../commands/annotations/constraints/Max.java |  25 +-
 .../commands/annotations/constraints/Min.java |  25 +-
 .../annotations/constraints/NotPerm.java      |  25 +-
 .../annotations/constraints/NotRole.java      |  31 +-
 .../annotations/constraints/NotUser.java      |  32 +--
 .../annotations/constraints/Perm.java         |  25 +-
 .../annotations/constraints/Role.java         |  31 +-
 .../annotations/constraints/User.java         |  32 +--
 .../annotations/constraints/package-info.java |   4 +-
 .../interactions/AutoComplete.java            |  10 +-
 .../annotations/interactions/Button.java      |  33 +--
 .../annotations/interactions/Choices.java     |  17 +-
 .../interactions/CommandScope.java            |  10 +
 .../interactions/ContextCommand.java          |  64 ++---
 .../annotations/interactions/Cooldown.java    |  25 +-
 .../interactions/EntitySelectMenu.java        |  87 +++---
 .../annotations/interactions/Interaction.java |  10 +-
 .../annotations/interactions/Modal.java       |  10 +-
 .../annotations/interactions/Optional.java    |  35 +--
 .../annotations/interactions/Param.java       |  27 +-
 .../annotations/interactions/Permissions.java |  45 +--
 .../annotations/interactions/ReplyConfig.java |   1 -
 .../interactions/SelectOption.java            |  51 ++--
 .../interactions/SlashCommand.java            |  73 ++---
 .../interactions/StringSelectMenu.java        |  39 ++-
 .../annotations/interactions/TextInput.java   |  76 ++---
 .../internal/SelectOptionContainer.java       |  11 +-
 .../annotations/internal/package-info.java    |   4 +-
 .../commands/annotations/package-info.java    |   4 +-
 .../jda/commands/definitions/Definition.java  |  27 ++
 .../description/ClassDescription.java         |  19 ++
 .../definitions/description/Description.java  |  31 ++
 .../definitions/description/Descriptor.java   |   8 +
 .../definitions/description/Invoker.java      |  20 ++
 .../description/MethodDescription.java        |  25 ++
 .../description/ParameterDescription.java     |  17 ++
 .../definitions/description/package-info.java |   6 +
 .../reflective/ReflectiveClassFinder.java     |  28 ++
 .../reflective/ReflectiveDescriptor.java      |  72 +++++
 .../description/reflective/package-info.java  |   3 +
 .../features/CustomIdJDAEntity.java           |  27 ++
 .../definitions/features/JDAEntity.java       |  35 +++
 .../features/internal/Invokable.java          |  51 ++++
 .../definitions/features/package-info.java    |   2 +
 .../interactions/AutoCompleteDefinition.java  |  51 ++++
 .../definitions/interactions/CustomId.java    | 105 +++++++
 .../interactions/InteractionDefinition.java   |  93 ++++++
 .../interactions/InteractionRegistry.java     | 203 +++++++++++++
 .../interactions/MethodBuildContext.java      |  27 ++
 .../interactions/ModalDefinition.java         | 168 +++++++++++
 .../command/CommandDefinition.java            |  40 +++
 .../command/ContextCommandDefinition.java     | 108 +++++++
 .../command}/ParameterDefinition.java         | 204 +++++++------
 .../command/SlashCommandDefinition.java       | 192 +++++++++++++
 .../interactions/command/package-info.java    |   2 +
 .../component/ButtonDefinition.java           | 100 +++++++
 .../component/ComponentDefinition.java        |  27 ++
 .../menu/EntitySelectMenuDefinition.java      | 115 ++++++++
 .../component/menu/SelectMenuDefinition.java  |  24 ++
 .../menu/StringSelectMenuDefinition.java      | 148 ++++++++++
 .../component/menu/package-info.java          |   2 +
 .../interactions/component/package-info.java  |   2 +
 .../interactions/package-info.java            |   2 +
 .../dependency/DefaultDependencyInjector.java |  15 +-
 .../dependency/DependencyInjector.java        |  53 ++--
 .../jda/commands/dependency/package-info.java |   4 +-
 .../ImplementationRegistry.java               | 102 +++----
 .../{internal => }/JDAEventListener.java      |  14 +-
 .../dispatching/{internal => }/Runtime.java   |  10 +-
 .../dispatching/adapter/TypeAdapter.java      |  23 +-
 .../adapter/TypeAdapterRegistry.java          |  69 ++---
 .../adapter/impl/AudioChannelAdapter.java     |  20 +-
 .../adapter/impl/BooleanAdapter.java          |  20 +-
 .../dispatching/adapter/impl/ByteAdapter.java |  18 +-
 .../adapter/impl/CharacterAdapter.java        |  18 +-
 .../adapter/impl/DoubleAdapter.java           |  18 +-
 .../adapter/impl/FloatAdapter.java            |  18 +-
 .../adapter/impl/GuildChannelAdapter.java     |  20 +-
 .../impl/GuildMessageChannelAdapter.java      |  20 +-
 .../adapter/impl/IntegerAdapter.java          |  18 +-
 .../dispatching/adapter/impl/LongAdapter.java |  18 +-
 .../adapter/impl/MemberAdapter.java           |  20 +-
 .../adapter/impl/NewsChannelAdapter.java      |  20 +-
 .../dispatching/adapter/impl/RoleAdapter.java |  20 +-
 .../adapter/impl/ShortAdapter.java            |  18 +-
 .../adapter/impl/StageChannelAdapter.java     |  20 +-
 .../adapter/impl/TextChannelAdapter.java      |  20 +-
 .../adapter/impl/ThreadChannelAdapter.java    |  20 +-
 .../dispatching/adapter/impl/UserAdapter.java |  20 +-
 .../adapter/impl/VoiceChannelAdapter.java     |  20 +-
 .../adapter/impl/package-info.java            |   4 +-
 .../dispatching/adapter/package-info.java     |   4 +-
 .../context/InvocationContext.java            |  14 +-
 .../dispatching/context/KeyValueStore.java    |  60 ++--
 .../commands/dispatching/events/Event.java    |  73 +----
 .../events/ModalReplyableEvent.java           |  34 +--
 .../dispatching/events/ReplyableEvent.java    |  56 +++-
 .../interactions/AutoCompleteEvent.java       |  61 ++--
 .../events/interactions/CommandEvent.java     |  21 +-
 .../events/interactions/ComponentEvent.java   |  23 +-
 .../events/interactions/ModalEvent.java       |  21 +-
 .../events/interactions/package-info.java     |   2 -
 .../dispatching/events/package-info.java      |   2 +-
 .../{ => expiration}/ExpirationStrategy.java  |   3 +-
 .../handling/AutoCompleteHandler.java         |  10 +-
 .../handling/ComponentHandler.java            |  12 +-
 .../handling/DispatchingContext.java          |   8 +-
 .../dispatching/handling/EventHandler.java    |  25 +-
 .../dispatching/handling/ModalHandler.java    |  12 +-
 .../command/ContextCommandHandler.java        |  13 +-
 .../handling/command/SlashCommandHandler.java |  22 +-
 .../dispatching/middleware/Middleware.java    |  26 +-
 .../middleware/MiddlewareRegistry.java        |  74 ++---
 .../dispatching/middleware/Priority.java      |  25 +-
 .../middleware/impl/ConstraintMiddleware.java |  32 +--
 .../middleware/impl/CooldownMiddleware.java   |  59 ++--
 .../impl/PermissionsMiddleware.java           |  33 +--
 .../commands/dispatching/package-info.java    |   4 +-
 .../commands/dispatching/reply/Component.java |   1 -
 .../dispatching/reply/ComponentReply.java     |   2 -
 .../dispatching/reply/ConfigurableReply.java  |  46 +--
 .../dispatching/reply/MessageReply.java       |  23 +-
 .../jda/commands/dispatching/reply/Reply.java |  28 +-
 .../dispatching/reply/package-info.java       |   4 +-
 .../dispatching/validation/Validator.java     |  25 +-
 .../validation/ValidatorRegistry.java         |  66 ++---
 .../validation/impl/MaximumValidator.java     |  23 +-
 .../validation/impl/MinimumValidator.java     |  25 +-
 .../impl/NotPermissionValidator.java          |  27 +-
 .../validation/impl/NotRoleValidator.java     |  23 +-
 .../validation/impl/NotUserValidator.java     |  23 +-
 .../validation/impl/PermissionValidator.java  |  26 +-
 .../validation/impl/RoleValidator.java        |  25 +-
 .../validation/impl/UserValidator.java        |  23 +-
 .../validation/impl/package-info.java         |   4 +-
 .../dispatching/validation/package-info.java  |   4 +-
 .../jda/commands/embeds/EmbedCache.java       |  93 ++----
 .../jda/commands/embeds/EmbedDTO.java         |   1 -
 .../error/DefaultErrorMessageFactory.java     |  29 +-
 .../embeds/error/ErrorMessageFactory.java     |  17 +-
 .../embeds/error/JsonErrorMessageFactory.java |  31 +-
 .../commands/embeds/error/package-info.java   |   4 +-
 .../jda/commands/internal/Helpers.java        |  70 +++--
 .../jda/commands/internal/JDAContext.java     |  50 +---
 .../internal/register/CommandTree.java        |  67 ++---
 .../register/SlashCommandUpdater.java         | 129 +++------
 .../commands/internal/register/TreeNode.java  | 126 ++++----
 .../kaktushose/jda/commands/package-info.java |   4 +-
 .../DefaultPermissionsProvider.java           |   3 +-
 .../permissions/PermissionsProvider.java      |   3 +-
 .../commands/permissions/package-info.java    |   4 +-
 .../reflect/ConstraintDefinition.java         |  13 -
 .../commands/reflect/CooldownDefinition.java  |  32 ---
 .../InteractionControllerDefinition.java      | 152 ----------
 .../commands/reflect/InteractionRegistry.java | 184 ------------
 .../commands/reflect/MethodBuildContext.java  |  26 --
 .../commands/reflect/TextInputDefinition.java |  81 ------
 .../interactions/AutoCompleteDefinition.java  |  71 -----
 .../reflect/interactions/CustomId.java        |  90 ------
 .../EphemeralInteractionDefinition.java       |  32 ---
 .../GenericInteractionDefinition.java         |  89 ------
 .../reflect/interactions/ModalDefinition.java | 143 ---------
 .../reflect/interactions/ReplyConfig.java     |  24 --
 .../commands/ContextCommandDefinition.java    | 111 -------
 .../commands/GenericCommandDefinition.java    | 146 ----------
 .../commands/SlashCommandDefinition.java      | 271 ------------------
 .../components/ButtonDefinition.java          | 157 ----------
 .../GenericComponentDefinition.java           |  35 ---
 .../menus/EntitySelectMenuDefinition.java     | 154 ----------
 .../menus/GenericSelectMenuDefinition.java    |  79 -----
 .../menus/SelectOptionDefinition.java         |  45 ---
 .../menus/StringSelectMenuDefinition.java     | 113 --------
 .../jda/commands/reflect/package-info.java    |   4 -
 .../scope/DefaultGuildScopeProvider.java      |   9 +-
 .../commands/scope/GuildScopeProvider.java    |  21 +-
 .../jda/commands/scope/package-info.java      |   4 +-
 src/main/java/module-info.java                |  19 +-
 .../java/adapting/mock/JDACommandsMock.java   |   8 +-
 .../commands/SlashCommandDefinitionTest.java  | 135 ++++-----
 .../ControllerDefinitionTestController.java   |  38 ---
 .../InteractionControllerDefinitionTest.java  | 101 -------
 .../parameters/ParameterDefinitionTest.java   |  49 ++--
 .../parameters/ParameterTestController.java   |   4 -
 189 files changed, 3405 insertions(+), 4508 deletions(-)
 create mode 100644 src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/CommandScope.java
 create mode 100644 src/main/java/com/github/kaktushose/jda/commands/definitions/Definition.java
 create mode 100644 src/main/java/com/github/kaktushose/jda/commands/definitions/description/ClassDescription.java
 create mode 100644 src/main/java/com/github/kaktushose/jda/commands/definitions/description/Description.java
 create mode 100644 src/main/java/com/github/kaktushose/jda/commands/definitions/description/Descriptor.java
 create mode 100644 src/main/java/com/github/kaktushose/jda/commands/definitions/description/Invoker.java
 create mode 100644 src/main/java/com/github/kaktushose/jda/commands/definitions/description/MethodDescription.java
 create mode 100644 src/main/java/com/github/kaktushose/jda/commands/definitions/description/ParameterDescription.java
 create mode 100644 src/main/java/com/github/kaktushose/jda/commands/definitions/description/package-info.java
 create mode 100644 src/main/java/com/github/kaktushose/jda/commands/definitions/description/reflective/ReflectiveClassFinder.java
 create mode 100644 src/main/java/com/github/kaktushose/jda/commands/definitions/description/reflective/ReflectiveDescriptor.java
 create mode 100644 src/main/java/com/github/kaktushose/jda/commands/definitions/description/reflective/package-info.java
 create mode 100644 src/main/java/com/github/kaktushose/jda/commands/definitions/features/CustomIdJDAEntity.java
 create mode 100644 src/main/java/com/github/kaktushose/jda/commands/definitions/features/JDAEntity.java
 create mode 100644 src/main/java/com/github/kaktushose/jda/commands/definitions/features/internal/Invokable.java
 create mode 100644 src/main/java/com/github/kaktushose/jda/commands/definitions/features/package-info.java
 create mode 100644 src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/AutoCompleteDefinition.java
 create mode 100644 src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/CustomId.java
 create mode 100644 src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/InteractionDefinition.java
 create mode 100644 src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/InteractionRegistry.java
 create mode 100644 src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/MethodBuildContext.java
 create mode 100644 src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/ModalDefinition.java
 create mode 100644 src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/CommandDefinition.java
 create mode 100644 src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/ContextCommandDefinition.java
 rename src/main/java/com/github/kaktushose/jda/commands/{reflect => definitions/interactions/command}/ParameterDefinition.java (54%)
 create mode 100644 src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/SlashCommandDefinition.java
 create mode 100644 src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/package-info.java
 create mode 100644 src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/ButtonDefinition.java
 create mode 100644 src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/ComponentDefinition.java
 create mode 100644 src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/menu/EntitySelectMenuDefinition.java
 create mode 100644 src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/menu/SelectMenuDefinition.java
 create mode 100644 src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/menu/StringSelectMenuDefinition.java
 create mode 100644 src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/menu/package-info.java
 create mode 100644 src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/package-info.java
 create mode 100644 src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/package-info.java
 rename src/main/java/com/github/kaktushose/jda/commands/{reflect => dispatching}/ImplementationRegistry.java (83%)
 rename src/main/java/com/github/kaktushose/jda/commands/dispatching/{internal => }/JDAEventListener.java (86%)
 rename src/main/java/com/github/kaktushose/jda/commands/dispatching/{internal => }/Runtime.java (94%)
 rename src/main/java/com/github/kaktushose/jda/commands/dispatching/{ => expiration}/ExpirationStrategy.java (95%)
 delete mode 100644 src/main/java/com/github/kaktushose/jda/commands/reflect/ConstraintDefinition.java
 delete mode 100644 src/main/java/com/github/kaktushose/jda/commands/reflect/CooldownDefinition.java
 delete mode 100644 src/main/java/com/github/kaktushose/jda/commands/reflect/InteractionControllerDefinition.java
 delete mode 100644 src/main/java/com/github/kaktushose/jda/commands/reflect/InteractionRegistry.java
 delete mode 100644 src/main/java/com/github/kaktushose/jda/commands/reflect/MethodBuildContext.java
 delete mode 100644 src/main/java/com/github/kaktushose/jda/commands/reflect/TextInputDefinition.java
 delete mode 100644 src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/AutoCompleteDefinition.java
 delete mode 100644 src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/CustomId.java
 delete mode 100644 src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/EphemeralInteractionDefinition.java
 delete mode 100644 src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/GenericInteractionDefinition.java
 delete mode 100644 src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/ModalDefinition.java
 delete mode 100644 src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/ReplyConfig.java
 delete mode 100644 src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/commands/ContextCommandDefinition.java
 delete mode 100644 src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/commands/GenericCommandDefinition.java
 delete mode 100644 src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/commands/SlashCommandDefinition.java
 delete mode 100644 src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/components/ButtonDefinition.java
 delete mode 100644 src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/components/GenericComponentDefinition.java
 delete mode 100644 src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/components/menus/EntitySelectMenuDefinition.java
 delete mode 100644 src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/components/menus/GenericSelectMenuDefinition.java
 delete mode 100644 src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/components/menus/SelectOptionDefinition.java
 delete mode 100644 src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/components/menus/StringSelectMenuDefinition.java
 delete mode 100644 src/main/java/com/github/kaktushose/jda/commands/reflect/package-info.java
 delete mode 100644 src/test/java/controller/ControllerDefinitionTestController.java
 delete mode 100644 src/test/java/controller/InteractionControllerDefinitionTest.java

diff --git a/pom.xml b/pom.xml
index f45bedc44..d8298bc0d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,6 +43,23 @@
                         <link>https://javadoc.io/doc/net.dv8tion/JDA/5.0.2</link>
                     </links>
                     <docfilessubdirs>true</docfilessubdirs>
+                    <tags>
+                        <tag>
+                            <name>apiNote</name>
+                            <placement>a</placement>
+                            <head>API Note:</head>
+                        </tag>
+                        <tag>
+                            <name>implSpec</name>
+                            <placement>a</placement>
+                            <head>Implementation Requirements:</head>
+                        </tag>
+                        <tag>
+                            <name>implNote</name>
+                            <placement>a</placement>
+                            <head>Implementation Note:</head>
+                        </tag>
+                    </tags>
                 </configuration>
             </plugin>
             <plugin>
diff --git a/src/main/java/com/github/kaktushose/jda/commands/JDACommands.java b/src/main/java/com/github/kaktushose/jda/commands/JDACommands.java
index 2e1346a1d..cbeb02375 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/JDACommands.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/JDACommands.java
@@ -1,13 +1,20 @@
 package com.github.kaktushose.jda.commands;
 
+import com.github.kaktushose.jda.commands.annotations.interactions.CommandScope;
 import com.github.kaktushose.jda.commands.annotations.interactions.EntitySelectMenu;
 import com.github.kaktushose.jda.commands.annotations.interactions.StringSelectMenu;
+import com.github.kaktushose.jda.commands.definitions.description.reflective.ReflectiveClassFinder;
+import com.github.kaktushose.jda.commands.definitions.description.reflective.ReflectiveDescriptor;
+import com.github.kaktushose.jda.commands.definitions.interactions.CustomId;
+import com.github.kaktushose.jda.commands.definitions.interactions.InteractionRegistry;
+import com.github.kaktushose.jda.commands.definitions.interactions.component.ButtonDefinition;
+import com.github.kaktushose.jda.commands.definitions.interactions.component.menu.SelectMenuDefinition;
 import com.github.kaktushose.jda.commands.dependency.DefaultDependencyInjector;
 import com.github.kaktushose.jda.commands.dependency.DependencyInjector;
-import com.github.kaktushose.jda.commands.dispatching.ExpirationStrategy;
-import com.github.kaktushose.jda.commands.dispatching.internal.JDAEventListener;
-import com.github.kaktushose.jda.commands.dispatching.internal.Runtime;
+import com.github.kaktushose.jda.commands.dispatching.ImplementationRegistry;
+import com.github.kaktushose.jda.commands.dispatching.JDAEventListener;
 import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapterRegistry;
+import com.github.kaktushose.jda.commands.dispatching.expiration.ExpirationStrategy;
 import com.github.kaktushose.jda.commands.dispatching.handling.DispatchingContext;
 import com.github.kaktushose.jda.commands.dispatching.middleware.MiddlewareRegistry;
 import com.github.kaktushose.jda.commands.dispatching.middleware.Priority;
@@ -17,10 +24,6 @@
 import com.github.kaktushose.jda.commands.dispatching.validation.ValidatorRegistry;
 import com.github.kaktushose.jda.commands.internal.JDAContext;
 import com.github.kaktushose.jda.commands.internal.register.SlashCommandUpdater;
-import com.github.kaktushose.jda.commands.reflect.ImplementationRegistry;
-import com.github.kaktushose.jda.commands.reflect.InteractionRegistry;
-import com.github.kaktushose.jda.commands.reflect.interactions.components.ButtonDefinition;
-import com.github.kaktushose.jda.commands.reflect.interactions.components.menus.GenericSelectMenuDefinition;
 import net.dv8tion.jda.api.JDA;
 import net.dv8tion.jda.api.interactions.commands.localization.LocalizationFunction;
 import net.dv8tion.jda.api.interactions.commands.localization.ResourceBundleLocalizationFunction;
@@ -53,7 +56,7 @@ private static JDACommands startInternal(Object jda, Class<?> clazz, Localizatio
         var adapterRegistry = new TypeAdapterRegistry();
         var validatorRegistry = new ValidatorRegistry();
         var implementationRegistry = new ImplementationRegistry(dependencyInjector, middlewareRegistry, adapterRegistry, validatorRegistry);
-        var interactionRegistry = new InteractionRegistry(validatorRegistry, dependencyInjector, function);
+        var interactionRegistry = new InteractionRegistry(dependencyInjector, validatorRegistry, function, new ReflectiveDescriptor());
 
         middlewareRegistry.register(Priority.PERMISSIONS, new PermissionsMiddleware(implementationRegistry));
         middlewareRegistry.register(Priority.NORMAL, new ConstraintMiddleware(implementationRegistry), new CooldownMiddleware(implementationRegistry));
@@ -62,7 +65,7 @@ private static JDACommands startInternal(Object jda, Class<?> clazz, Localizatio
 
         implementationRegistry.index(clazz, packages);
 
-        interactionRegistry.index(clazz, packages);
+        interactionRegistry.index(ReflectiveClassFinder.find(clazz, packages));
 
         var updater = new SlashCommandUpdater(jdaContext, implementationRegistry.getGuildScopeProvider(), interactionRegistry);
         updater.updateAllCommands();
@@ -171,14 +174,14 @@ public void shutdown() {
 
     /**
      * Updates all slash commands that are registered with
-     * {@link com.github.kaktushose.jda.commands.annotations.interactions.SlashCommand.CommandScope#GUILD
+     * {@link CommandScope#GUILD
      * CommandScope#Guild}
      */
     public void updateGuildCommands() {
         updater.updateGuildCommands();
     }
 
-    /// Gets a [`Button`][com.github.kaktushose.jda.commands.annotations.interactions.Button] based on the method name
+    /// Gets a [`Button`][com.github.kaktushose.jda.commands.annotations.interactions.Button] based on the definition id
     /// and transforms it into a JDA [Button].
     ///
     /// The button will be [`Runtime`]({@docRoot}/index.html#runtime-concept-heading) independent. This may be useful if you want to send a message without
@@ -188,38 +191,22 @@ public void updateGuildCommands() {
     /// @return the JDA [Button]
     @NotNull
     public Button getButton(@NotNull String button) {
-        if (!button.matches("[a-zA-Z]+\\.[a-zA-Z]+")) {
-            throw new IllegalArgumentException("Unknown Button");
-        }
-
-        String sanitizedId = button.replaceAll("\\.", "");
-        ButtonDefinition buttonDefinition = interactionRegistry.getButtons().stream()
-                .filter(it -> it.getDefinitionId().equals(sanitizedId))
-                .findFirst().orElseThrow(() -> new IllegalArgumentException("Unknown Button"));
-
-        return buttonDefinition.toButton().withId(buttonDefinition.independentCustomId());
+        var id = String.valueOf(button.replaceAll("\\.", "").hashCode());
+        var definition = interactionRegistry.find(ButtonDefinition.class, false, it -> it.definitionId().equals(id));
+        return definition.toJDAEntity(CustomId.independent(definition.definitionId()));
     }
 
-    /// Gets a [StringSelectMenu] or [EntitySelectMenu] based on the method name and transforms it into a JDA [SelectMenu].
+    /// Gets a [StringSelectMenu] or [EntitySelectMenu] based on the definition id and transforms it into a JDA [SelectMenu].
     ///
     /// The select menu will be [`Runtime`]({@docRoot}/index.html#runtime-concept-heading) independent. This may be useful if you want to send a component
     /// without using the framework.
     ///
-    /// @param <S>  the type of [SelectMenu]
     /// @param menu the name of the select menu
     /// @return the JDA [SelectMenu]
-    @SuppressWarnings("unchecked")
     @NotNull
-    public <S extends SelectMenu> S getSelectMenu(@NotNull String menu) {
-        if (!menu.matches("[a-zA-Z]+\\.[a-zA-Z]+")) {
-            throw new IllegalArgumentException("Unknown Select Menu");
-        }
-
-        String sanitizedId = menu.replaceAll("\\.", "");
-        GenericSelectMenuDefinition<?> selectMenuDefinition = interactionRegistry.getSelectMenus().stream()
-                .filter(it -> it.getDefinitionId().equals(sanitizedId))
-                .findFirst().orElseThrow(() -> new IllegalArgumentException("Unknown Select Menu"));
-
-        return (S) selectMenuDefinition.toSelectMenu(selectMenuDefinition.independentCustomId(), true);
+    public SelectMenu getSelectMenu(@NotNull String menu) {
+        var id = String.valueOf(menu.replaceAll("\\.", "").hashCode());
+        var definition = interactionRegistry.find(SelectMenuDefinition.class, false, it -> it.definitionId().equals(id));
+        return (SelectMenu) definition.toJDAEntity(CustomId.independent(definition.definitionId()));
     }
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/annotations/Implementation.java b/src/main/java/com/github/kaktushose/jda/commands/annotations/Implementation.java
index 99aedd334..6df27a324 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/annotations/Implementation.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/annotations/Implementation.java
@@ -1,46 +1,40 @@
 package com.github.kaktushose.jda.commands.annotations;
 
 import com.github.kaktushose.jda.commands.annotations.constraints.Constraint;
+import com.github.kaktushose.jda.commands.dispatching.ImplementationRegistry;
+import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapter;
+import com.github.kaktushose.jda.commands.dispatching.middleware.Middleware;
 import com.github.kaktushose.jda.commands.dispatching.middleware.Priority;
+import com.github.kaktushose.jda.commands.dispatching.validation.Validator;
 import com.github.kaktushose.jda.commands.embeds.error.ErrorMessageFactory;
+import com.github.kaktushose.jda.commands.permissions.PermissionsProvider;
+import com.github.kaktushose.jda.commands.scope.GuildScopeProvider;
 
 import java.lang.annotation.*;
 
-/**
- * Indicates that the annotated class is a custom implementation that should replace the default implementation.
- *
- * @see com.github.kaktushose.jda.commands.reflect.ImplementationRegistry ImplementationRegistry
- * @see com.github.kaktushose.jda.commands.dispatching.middleware.Middleware Middleware
- * @see com.github.kaktushose.jda.commands.dispatching.validation.Validator Validator
- * @see com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapter TypeAdapter
- * @see com.github.kaktushose.jda.commands.permissions.PermissionsProvider PermissionsProvider
- * @see com.github.kaktushose.jda.commands.scope.GuildScopeProvider GuildScopeProvider
- * @see ErrorMessageFactory ErrorMessageFactory
- * @since 2.0.0
- */
+/// Indicates that the annotated class is a custom implementation that should replace the default implementation.
+///
+/// @see ImplementationRegistry
+/// @see Middleware
+/// @see Validator
+/// @see TypeAdapter
+/// @see PermissionsProvider
+/// @see GuildScopeProvider
+/// @see ErrorMessageFactory
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)
 public @interface Implementation {
 
-    /**
-     * Gets the {@link Priority} to register the
-     * {@link com.github.kaktushose.jda.commands.dispatching.middleware.Middleware Middleware} with. If this
-     * implementation is not a subtype
-     * of {@link com.github.kaktushose.jda.commands.dispatching.middleware.Middleware Middleware}, this field can be
-     * ignored.
-     *
-     * @return the {@link Priority}
-     */
+    /// Gets the [Priority] to register the [Middleware] with. If this implementation is not a subtype of [Middleware],
+    /// this field can be ignored.
+    ///
+    /// @return the [Priority]
     Priority priority() default Priority.NORMAL;
 
-    /**
-     * Gets the annotation the {@link com.github.kaktushose.jda.commands.dispatching.validation.Validator Validator}
-     * should be mapped to. If this class is not a subtype of
-     * {@link com.github.kaktushose.jda.commands.dispatching.validation.Validator Validator}, this field can be ignored.
-     *
-     * @return the annotation the {@link com.github.kaktushose.jda.commands.dispatching.validation.Validator Validator}
-     * should be mapped to
-     */
+    /// Gets the annotation the [Validator] should be mapped to. If this class is not a subtype of [Validator],
+    /// this field can be ignored.
+    ///
+    /// @return the annotation the [Validator] should be mapped to
     Class<? extends Annotation> annotation() default Constraint.class;
 
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/annotations/Inject.java b/src/main/java/com/github/kaktushose/jda/commands/annotations/Inject.java
index 55ccbc257..81371c243 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/annotations/Inject.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/annotations/Inject.java
@@ -5,14 +5,11 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-/**
- * Fields annotated with Inject will be assigned a value that is provided by a {@link Produces} method.
- * If no Producer for the field type is available then the field will be assigned {@code null}. Please note, that each
- * field type can only have one producer.
- *
- * @see Produces
- * @since 1.0.0
- */
+/// Fields annotated with Inject will be assigned a value that is provided by a [Produces] method.
+/// If no Producer for the field type is available then the field will be assigned `null`. Please note, that each
+/// field type can only have one producer.
+///
+/// @see Produces
 @Target(ElementType.FIELD)
 @Retention(RetentionPolicy.RUNTIME)
 public @interface Inject {
diff --git a/src/main/java/com/github/kaktushose/jda/commands/annotations/Produces.java b/src/main/java/com/github/kaktushose/jda/commands/annotations/Produces.java
index 63383d2fc..63aa6c485 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/annotations/Produces.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/annotations/Produces.java
@@ -1,42 +1,37 @@
 package com.github.kaktushose.jda.commands.annotations;
 
+import com.github.kaktushose.jda.commands.annotations.interactions.Interaction;
+import com.github.kaktushose.jda.commands.dependency.DependencyInjector;
+
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-/**
- * Methods annotated with Produces will be used to get the instance of a dependency.
- *
- * <p>The instances provided by producer methods are used to inject values to the fields inside a
- * {@link com.github.kaktushose.jda.commands.annotations.interactions.Interaction Interaction}
- * that are annotated with {@link Inject}. The access modifier of a producer method must be
- * public.
- *
- * <p>Classes containing producer methods will be found automatically on startup. They can also be registered via
- * {@link com.github.kaktushose.jda.commands.dependency.DependencyInjector#registerProvider(Object)
- * DependencyInjector.registerProvider(Object)}
- *
- * <p>Please note that this is only a very basic implementation of dependency injection and can only be used inside
- * interaction controller classes or custom {@link Implementation implementations}. Furthermore, each type can only
- * have one producer. In other words you cannot register different instances of the same dependency.
- *
- * @see Inject
- * @see com.github.kaktushose.jda.commands.dependency.DependencyInjector DependencyInjector
- * @since 1.0.0
- */
+/// Methods annotated with Produces will be used to get the instance of a dependency.
+///
+/// The instances provided by producer methods are used to inject values to the fields inside a [Interaction]
+/// that are annotated with [Inject]. The access modifier of a producer method must be
+/// public.
+///
+/// Classes containing producer methods will be found automatically on startup. They can also be registered via
+/// [DependencyInjector#registerProvider(Object)]
+///
+/// Please note that this is only a very basic implementation of dependency injection and can only be used inside
+/// interaction controller classes or custom [Implementation]s. Furthermore, each type can only
+/// have one producer. In other words you cannot register different instances of the same dependency.
+///
+/// @see Inject
+/// @see com.github.kaktushose.jda.commands.dependency.DependencyInjector DependencyInjector
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)
 public @interface Produces {
 
-    /**
-     * Whether jda-commands should ignore this method at indexing during startup. Useful if you wish to register your
-     * dependency providers manually by calling
-     * {@link com.github.kaktushose.jda.commands.dependency.DependencyInjector#registerProvider(Object)
-     * DependencyInjector#registerProvider(Object)}
-     *
-     * @return Whether jda-commands should ignore this method, default {@code true}
-     */
+    /// Whether jda-commands should ignore this method at indexing during startup. Useful if you wish to register your
+    /// dependency providers manually by calling
+    /// [DependencyInjector#registerProvider(Object)]
+    ///
+    /// @return Whether jda-commands should ignore this method, default `true`
     boolean skipIndexing() default false;
 
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/Constraint.java b/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/Constraint.java
index 3ed0aef29..e27e1eb5f 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/Constraint.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/Constraint.java
@@ -5,21 +5,16 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-/**
- * Indicates that an annotation type can be used for parameter validation. When implementing custom validators, the
- * annotation type must be annotated with this annotation.
- *
- * @see com.github.kaktushose.jda.commands.dispatching.validation.ValidatorRegistry ValidatorRegistry
- * @since 2.0.0
- */
+/// Indicates that an annotation type can be used for parameter validation. When implementing custom validators, the
+/// annotation type must be annotated with this annotation.
+///
+/// @see com.github.kaktushose.jda.commands.dispatching.validation.ValidatorRegistry ValidatorRegistry
 @Target(ElementType.ANNOTATION_TYPE)
 @Retention(RetentionPolicy.RUNTIME)
 public @interface Constraint {
 
-    /**
-     * Returns an array of all types this annotation can be used for.
-     *
-     * @return an array of all types this annotation can be used for
-     */
+    /// Returns an array of all types this annotation can be used for.
+    ///
+    /// @return an array of all types this annotation can be used for
     Class<?>[] value();
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/Max.java b/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/Max.java
index 222a92f30..76ba440a8 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/Max.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/Max.java
@@ -5,28 +5,21 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-/**
- * The annotated element must be a number whose value must be lower or equal to the specified maximum.
- *
- * @see Constraint
- * @since 2.0.0
- */
+/// The annotated element must be a number whose value must be less or equal to the specified maximum.
+///
+/// @see Constraint
 @Target(ElementType.PARAMETER)
 @Retention(RetentionPolicy.RUNTIME)
 @Constraint({Byte.class, Short.class, Integer.class, Long.class, Float.class, Double.class})
 public @interface Max {
 
-    /**
-     * Returns the value the element must be lower or equal to.
-     *
-     * @return Returns the value the element must be lower or equal to
-     */
+    /// Returns the value the element must be less or equal to.
+    ///
+    /// @return Returns the value the element must be less or equal to
     long value();
 
-    /**
-     * Returns the error message that will be displayed if the constraint fails.
-     *
-     * @return the error message
-     */
+    /// Returns the error message that will be displayed if the constraint fails.
+    ///
+    /// @return the error message
     String message() default "Parameter exceeds maximum value";
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/Min.java b/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/Min.java
index 84af82013..7706fa846 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/Min.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/Min.java
@@ -5,28 +5,21 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-/**
- * The annotated element must be a number whose value must be greater or equal to the specified minimum.
- *
- * @see Constraint
- * @since 2.0.0
- */
+/// The annotated element must be a number whose value must be greater or equal to the specified minimum.
+///
+/// @see Constraint
 @Target(ElementType.PARAMETER)
 @Retention(RetentionPolicy.RUNTIME)
 @Constraint({Byte.class, Short.class, Integer.class, Long.class, Float.class, Double.class})
 public @interface Min {
 
-    /**
-     * Returns the value the element must be greater or equal to.
-     *
-     * @return Returns the value the element must be greater or equal to
-     */
+    /// Returns the value the element must be greater or equal to.
+    ///
+    /// @return Returns the value the element must be greater or equal to
     long value();
 
-    /**
-     * Returns the error message that will be displayed if the constraint fails.
-     *
-     * @return the error message
-     */
+    /// Returns the error message that will be displayed if the constraint fails.
+    ///
+    /// @return the error message
     String message() default "Parameter falls below minimum value";
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/NotPerm.java b/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/NotPerm.java
index 68e6fa8a7..8268572f2 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/NotPerm.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/NotPerm.java
@@ -8,28 +8,21 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-/**
- * The annotated element must be a user or member that <b>doesn't</b> have the specified discord permission.
- *
- * @see Constraint
- * @since 2.0.0
- */
+/// The annotated element must be a user or member that **doesn't** have the specified discord permission.
+///
+/// @see Constraint
 @Target(ElementType.PARAMETER)
 @Retention(RetentionPolicy.RUNTIME)
 @Constraint({Member.class, User.class})
 public @interface NotPerm {
 
-    /**
-     * Returns the discord permission(s) the element must not have.
-     *
-     * @return the discord permission(s) the element must not have.
-     */
+    /// Returns the discord permission(s) the element must not have.
+    ///
+    /// @return the discord permission(s) the element must not have.
     String[] value();
 
-    /**
-     * Returns the error message that will be displayed if the constraint fails.
-     *
-     * @return the error message
-     */
+    /// Returns the error message that will be displayed if the constraint fails.
+    ///
+    /// @return the error message
     String message() default "Member or User has at least one permission that isn't allowed";
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/NotRole.java b/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/NotRole.java
index c2b8c06f0..32adef342 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/NotRole.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/NotRole.java
@@ -1,5 +1,6 @@
 package com.github.kaktushose.jda.commands.annotations.constraints;
 
+import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapterRegistry;
 import net.dv8tion.jda.api.entities.Member;
 
 import java.lang.annotation.ElementType;
@@ -7,31 +8,23 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-/**
- * The annotated element must be member that <b>doesn't</b> have the specified guild role. This constraint will use the
- * {@link com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapterRegistry TypeAdapterRegistry} to determine
- * the role.
- *
- * @see Constraint
- * @see com.github.kaktushose.jda.commands.dispatching.adapter.impl.RoleAdapter RoleAdapter
- * @since 2.0.0
- */
+/// The annotated element must be member that **doesn't** have the specified guild role. This constraint will use the
+/// [TypeAdapterRegistry] to determine the role.
+///
+/// @see Constraint
+/// @see com.github.kaktushose.jda.commands.dispatching.adapter.impl.RoleAdapter RoleAdapter
 @Target(ElementType.PARAMETER)
 @Retention(RetentionPolicy.RUNTIME)
 @Constraint({Member.class})
 public @interface NotRole {
 
-    /**
-     * Returns the guild role the element must not have.
-     *
-     * @return the guild role the element must not have.
-     */
+    /// Returns the guild role the element must not have.
+    ///
+    /// @return the guild role the element must not have.
     String value();
 
-    /**
-     * Returns the error message that will be displayed if the constraint fails.
-     *
-     * @return the error message
-     */
+    /// Returns the error message that will be displayed if the constraint fails.
+    ///
+    /// @return the error message
     String message() default "Member has at least one role that isn't allowed";
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/NotUser.java b/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/NotUser.java
index 1f55b3698..809e22045 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/NotUser.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/NotUser.java
@@ -1,5 +1,7 @@
 package com.github.kaktushose.jda.commands.annotations.constraints;
 
+import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapterRegistry;
+import com.github.kaktushose.jda.commands.dispatching.adapter.impl.RoleAdapter;
 import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.User;
 
@@ -8,31 +10,23 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-/**
- * The annotated element must <b>not</b> be the specified user or member. This constraint will use the
- * {@link com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapterRegistry TypeAdapterRegistry} to
- * determine the user or member.
- *
- * @see Constraint
- * @see com.github.kaktushose.jda.commands.dispatching.adapter.impl.RoleAdapter RoleAdapter
- * @since 2.0.0
- */
+/// The annotated element must **not** be the specified user or member. This constraint will use the
+/// [TypeAdapterRegistry] to determine the user or member.
+///
+/// @see Constraint
+/// @see RoleAdapter
 @Target(ElementType.PARAMETER)
 @Retention(RetentionPolicy.RUNTIME)
 @Constraint({Member.class, User.class})
 public @interface NotUser {
 
-    /**
-     * Returns the user or member the element must not be equals to.
-     *
-     * @return the user or member the element must not be equals to
-     */
+    /// Returns the user or member the element must not be equals to.
+    ///
+    /// @return the user or member the element must not be equals to
     String value();
 
-    /**
-     * Returns the error message that will be displayed if the constraint fails.
-     *
-     * @return the error message
-     */
+    /// Returns the error message that will be displayed if the constraint fails.
+    ///
+    /// @return the error message
     String message() default "The given Member or User is invalid as a parameter";
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/Perm.java b/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/Perm.java
index 59dc22409..bdf42ea4e 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/Perm.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/Perm.java
@@ -8,28 +8,21 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-/**
- * The annotated element must be a user or member that have the specified discord permission.
- *
- * @see Constraint
- * @since 2.0.0
- */
+/// The annotated element must be a user or member that have the specified discord permission.
+///
+/// @see Constraint
 @Target(ElementType.PARAMETER)
 @Retention(RetentionPolicy.RUNTIME)
 @Constraint({Member.class, User.class})
 public @interface Perm {
 
-    /**
-     * Returns the discord permission(s) the element must have.
-     *
-     * @return the discord permission(s) the element must have.
-     */
+    /// Returns the discord permission(s) the element must have.
+    ///
+    /// @return the discord permission(s) the element must have.
     String[] value();
 
-    /**
-     * Returns the error message that will be displayed if the constraint fails.
-     *
-     * @return the error message
-     */
+    /// Returns the error message that will be displayed if the constraint fails.
+    ///
+    /// @return the error message
     String message() default "Member or User is missing at least one permission that is required";
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/Role.java b/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/Role.java
index 0cfc01ef3..58a1a8108 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/Role.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/Role.java
@@ -1,5 +1,7 @@
 package com.github.kaktushose.jda.commands.annotations.constraints;
 
+import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapterRegistry;
+import com.github.kaktushose.jda.commands.dispatching.adapter.impl.RoleAdapter;
 import net.dv8tion.jda.api.entities.Member;
 
 import java.lang.annotation.ElementType;
@@ -7,30 +9,23 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-/**
- * The annotated element must be member that have the specified guild role. This constraint will use the
- * {@link com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapterRegistry} to determine the role.
- *
- * @see Constraint
- * @see com.github.kaktushose.jda.commands.dispatching.adapter.impl.RoleAdapter RoleAdapter
- * @since 2.0.0
- */
+/// The annotated element must be member that have the specified guild role. This constraint will use the
+/// [TypeAdapterRegistry] to determine the role.
+///
+/// @see Constraint
+/// @see RoleAdapter
 @Target(ElementType.PARAMETER)
 @Retention(RetentionPolicy.RUNTIME)
 @Constraint({Member.class})
 public @interface Role {
 
-    /**
-     * Returns the guild role the element must have.
-     *
-     * @return the guild role the element must have.
-     */
+    /// Returns the guild role the element must have.
+    ///
+    /// @return the guild role the element must have.
     String value();
 
-    /**
-     * Returns the error message that will be displayed if the constraint fails.
-     *
-     * @return the error message
-     */
+    /// Returns the error message that will be displayed if the constraint fails.
+    ///
+    /// @return the error message
     String message() default "Member or User is missing at least one role that is required";
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/User.java b/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/User.java
index 96c3e5f13..048cad8b1 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/User.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/User.java
@@ -1,5 +1,7 @@
 package com.github.kaktushose.jda.commands.annotations.constraints;
 
+import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapterRegistry;
+import com.github.kaktushose.jda.commands.dispatching.adapter.impl.RoleAdapter;
 import net.dv8tion.jda.api.entities.Member;
 
 import java.lang.annotation.ElementType;
@@ -7,31 +9,23 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-/**
- * The annotated element must be the specified user or member. This constraint will use the
- * {@link com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapterRegistry TypeAdapterRegistry} to determine
- * the user or member.
- *
- * @see Constraint
- * @see com.github.kaktushose.jda.commands.dispatching.adapter.impl.RoleAdapter RoleAdapter
- * @since 2.0.0
- */
+/// The annotated element must be the specified user or member. This constraint will use the
+/// [TypeAdapterRegistry] to determine the user or member.
+///
+/// @see Constraint
+/// @see RoleAdapter
 @Target(ElementType.PARAMETER)
 @Retention(RetentionPolicy.RUNTIME)
 @Constraint({Member.class, net.dv8tion.jda.api.entities.User.class})
 public @interface User {
 
-    /**
-     * Returns the user or member the element must be equals to.
-     *
-     * @return the user or member the element must be equals to
-     */
+    /// Returns the user or member the element must be equals to.
+    ///
+    /// @return the user or member the element must be equals to
     String value();
 
-    /**
-     * Returns the error message that will be displayed if the constraint fails.
-     *
-     * @return the error message
-     */
+    /// Returns the error message that will be displayed if the constraint fails.
+    ///
+    /// @return the error message
     String message() default "The given Member or User is invalid as a parameter";
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/package-info.java b/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/package-info.java
index 44c9ff02b..88abd9075 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/package-info.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/package-info.java
@@ -1,4 +1,2 @@
-/**
- * All annotations needed for parameter validation.
- */
+/// All annotations needed for parameter validation.
 package com.github.kaktushose.jda.commands.annotations.constraints;
diff --git a/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/AutoComplete.java b/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/AutoComplete.java
index 5af595b39..28fa08b8f 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/AutoComplete.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/AutoComplete.java
@@ -23,18 +23,14 @@
 ///     event.replyChoices(...);
 /// }
 /// ```
-///
 /// @see SlashCommand
-/// @since 4.0.0
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)
 public @interface AutoComplete {
 
-    /**
-     * Returns the name of the slash commands this autocomplete should handle.
-     *
-     * @return the slash commands
-     */
+    /// Returns the name of the slash commands this autocomplete should handle.
+    ///
+    /// @return the slash commands
     String[] value();
 
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Button.java b/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Button.java
index 8d51a4073..61573d7d0 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Button.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Button.java
@@ -28,37 +28,28 @@
 /// ```
 ///
 /// @see Interaction
-/// @since 2.3.0
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)
 public @interface Button {
 
-    /**
-     * Gets the label of the button.
-     *
-     * @return the label of the button
-     */
+    /// Gets the label of the button.
+    ///
+    /// @return the label of the button
     String value() default "";
 
-    /**
-     * Gets the {@link ButtonStyle}.
-     *
-     * @return the {@link ButtonStyle}
-     */
+    /// Gets the [ButtonStyle].
+    ///
+    /// @return the [ButtonStyle]
     ButtonStyle style() default ButtonStyle.PRIMARY;
 
-    /**
-     * Gets the {@link Emoji} of the button.
-     *
-     * @return the {@link Emoji}
-     */
+    /// Gets the [Emoji] of the button.
+    ///
+    /// @return the [Emoji]
     String emoji() default "";
 
-    /**
-     * Gets the link of the button.
-     *
-     * @return the link of the button
-     */
+    /// Gets the link of the button.
+    ///
+    /// @return the link of the button
     String link() default "";
 
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Choices.java b/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Choices.java
index bc04a52c3..52f4ac2e4 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Choices.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Choices.java
@@ -5,21 +5,16 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-/**
- * Annotation used to add choices to parameters.
- *
- * @see SlashCommand
- * @since 2.3.0
- */
+/// Annotation used to add choices to parameters.
+///
+/// @see SlashCommand
 @Target(ElementType.PARAMETER)
 @Retention(RetentionPolicy.RUNTIME)
 public @interface Choices {
 
-    /**
-     * Returns the choices of a parameter. This value will only be used for slash commands.
-     *
-     * @return the choices of the parameter
-     */
+    /// Returns the choices of a parameter. This value will only be used for slash commands.
+    ///
+    /// @return the choices of the parameter
     String[] value();
 
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/CommandScope.java b/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/CommandScope.java
new file mode 100644
index 000000000..e12319159
--- /dev/null
+++ b/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/CommandScope.java
@@ -0,0 +1,10 @@
+package com.github.kaktushose.jda.commands.annotations.interactions;
+
+/// Enum describing the two possible scopes a command can be registered for.
+///
+/// @see SlashCommand#scope()
+/// @see ContextCommand#scope()
+public enum CommandScope {
+    GUILD,
+    GLOBAL
+}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/ContextCommand.java b/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/ContextCommand.java
index 602081004..56d498795 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/ContextCommand.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/ContextCommand.java
@@ -28,59 +28,45 @@
 /// @ContextCommand(value = "user context command", type = Command.Type.USER)
 /// public void onCommand(CommandEvent event, User target) { ... }
 /// ```
-///
 /// @see Interaction
-/// @since 4.0.0
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)
 public @interface ContextCommand {
 
-    /**
-     * Returns the name of the command.
-     *
-     * @return the name of the command
-     */
+    /// Returns the name of the command.
+    ///
+    /// @return the name of the command
     String value() default "";
 
-    /**
-     * Returns whether this command is only usable in a guild.
-     * This only has an effect if this command is registered globally.
-     *
-     * @return {@code true} if this command is only usable in a guild
-     */
+    /// Returns whether this command is only usable in a guild.
+    /// This only has an effect if this command is registered globally.
+    ///
+    /// @return `true` if this command is only usable in a guild
     boolean isGuildOnly() default false;
 
-    /**
-     * Returns whether this command can only be executed in NSFW channels.
-     *
-     * @return {@code true} if this command can only be executed in NSFW channels
-     */
+    /// Returns whether this command can only be executed in NSFW channels.
+    ///
+    /// @return `true` if this command can only be executed in NSFW channels
     boolean isNSFW() default false;
 
-    /**
-     * Returns an array of {@link net.dv8tion.jda.api.Permission Permissions} this command
-     * should be enabled for by default. Note that guild admins can modify this at any time.
-     *
-     * @return an array of permissions this command will be enabled for by default
-     * @see Permissions Permission
-     * @see net.dv8tion.jda.api.interactions.commands.DefaultMemberPermissions DefaultMemberPermissions.ENABLED
-     * @see net.dv8tion.jda.api.interactions.commands.DefaultMemberPermissions DefaultMemberPermissions.DISABLED
-     */
+    /// Returns an array of [Permission] this command
+    /// should be enabled for by default. Note that guild admins can modify this at any time.
+    ///
+    /// @return an array of permissions this command will be enabled for by default
+    /// @see Permissions Permission
+    /// @see net.dv8tion.jda.api.interactions.commands.DefaultMemberPermissions DefaultMemberPermissions.ENABLED
+    /// @see net.dv8tion.jda.api.interactions.commands.DefaultMemberPermissions DefaultMemberPermissions.DISABLED
     Permission[] enabledFor() default Permission.UNKNOWN;
 
-    /**
-     * Returns whether this command should be registered as a global or as a guild command.
-     *
-     * @return whether this command should be registered as a global or as a guild command
-     * @see SlashCommand.CommandScope
-     */
-    SlashCommand.CommandScope scope() default SlashCommand.CommandScope.GLOBAL;
+    /// Returns whether this command should be registered as a global or as a guild command.
+    ///
+    /// @return whether this command should be registered as a global or as a guild command
+    /// @see CommandScope
+    CommandScope scope() default CommandScope.GLOBAL;
 
-    /**
-     * Gets the type of this command.
-     *
-     * @return the type of the command
-     */
+    /// Gets the type of this command.
+    ///
+    /// @return the type of the command
     Command.Type type();
 
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Cooldown.java b/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Cooldown.java
index c7c7f1dc4..6ffeac8dd 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Cooldown.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Cooldown.java
@@ -6,28 +6,21 @@
 import java.lang.annotation.Target;
 import java.util.concurrent.TimeUnit;
 
-/**
- * Commands annotated with Cooldown will have a per-user cooldown.
- *
- * @see com.github.kaktushose.jda.commands.dispatching.middleware.impl.CooldownMiddleware CooldownMiddleware
- * @since 1.0.0
- */
+/// Commands annotated with Cooldown will have a per-user cooldown.
+///
+/// @see com.github.kaktushose.jda.commands.dispatching.middleware.impl.CooldownMiddleware CooldownMiddleware
 @Target({ElementType.METHOD, ElementType.TYPE})
 @Retention(RetentionPolicy.RUNTIME)
 public @interface Cooldown {
 
-    /**
-     * Returns the delay of the cooldown.
-     *
-     * @return the delay of the cooldown
-     */
+    /// Returns the delay of the cooldown.
+    ///
+    /// @return the delay of the cooldown
     long value();
 
-    /**
-     * Returns the {@link TimeUnit} of the specified delay.
-     *
-     * @return the {@link TimeUnit} of the specified delay
-     */
+    /// Returns the [TimeUnit] of the specified delay.
+    ///
+    /// @return the [TimeUnit] of the specified delay
     TimeUnit timeUnit();
 
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/EntitySelectMenu.java b/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/EntitySelectMenu.java
index 5a68978fc..45b253854 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/EntitySelectMenu.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/EntitySelectMenu.java
@@ -29,75 +29,60 @@
 /// public void onMenu(ComponentEvent event, Mentions mentions) { ... }
 /// ```
 /// @see Interaction
-/// @since 2.3.0
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)
 public @interface EntitySelectMenu {
 
-    /**
-     * Supported {@link SelectTarget SelectTargets}.
-     *
-     * @return an array of supported {@link SelectTarget SelectTargets}
-     */
+    /// Supported [SelectTarget]s.
+    ///
+    /// @return an array of supported [SelectTarget]s
     SelectTarget[] value();
 
-    /**
-     * The {@link net.dv8tion.jda.api.interactions.components.selections.EntitySelectMenu.DefaultValue default values}
-     * for roles that will be shown to the user.
-     *
-     * @return the {@link net.dv8tion.jda.api.interactions.components.selections.EntitySelectMenu.DefaultValue default values}
-     */
+    /// The [default values][net.dv8tion.jda.api.interactions.components.selections.EntitySelectMenu.DefaultValue]
+    /// for roles that will be shown to the user.
+    ///
+    /// @return the [default values][net.dv8tion.jda.api.interactions.components.selections.EntitySelectMenu.DefaultValue]
     long[] defaultRoles() default -1;
 
-    /**
-     * The {@link net.dv8tion.jda.api.interactions.components.selections.EntitySelectMenu.DefaultValue default values}
-     * for channels that will be shown to the user.
-     *
-     * @return the {@link net.dv8tion.jda.api.interactions.components.selections.EntitySelectMenu.DefaultValue default values}
-     */
+    /// The [default values][net.dv8tion.jda.api.interactions.components.selections.EntitySelectMenu.DefaultValue]
+    /// for channels that will be shown to the user.
+    ///
+    /// @return the [default values][net.dv8tion.jda.api.interactions.components.selections.EntitySelectMenu.DefaultValue]
     long[] defaultChannels() default -1;
 
-    /**
-     * The {@link net.dv8tion.jda.api.interactions.components.selections.EntitySelectMenu.DefaultValue default values}
-     * for users that will be shown to the user.
-     *
-     * @return the {@link net.dv8tion.jda.api.interactions.components.selections.EntitySelectMenu.DefaultValue default values}
-     */
+    /// The [default values][net.dv8tion.jda.api.interactions.components.selections.EntitySelectMenu.DefaultValue]
+    /// for users that will be shown to the user.
+    ///
+    /// @return the [default values][net.dv8tion.jda.api.interactions.components.selections.EntitySelectMenu.DefaultValue]
     long[] defaultUsers() default -1;
 
-    /**
-     * The {@link ChannelType ChannelTypes} that should be supported by this menu.
-     * This is only relevant for menus that allow CHANNEL targets.
-     *
-     * @return the {@link ChannelType ChannelTypes} that should be supported by this menu
-     */
+    /// The [ChannelType]s that should be supported by this menu.
+    /// This is only relevant for menus that allow CHANNEL targets.
+    ///
+    /// @return the [ChannelType]s that should be supported by this menu
     ChannelType[] channelTypes() default ChannelType.UNKNOWN;
 
-    /**
-     * Configure the placeholder which is displayed when no selections have been made yet.
-     *
-     * @return the placeholder which is displayed when no selections have been made yet
-     */
+    /// Configure the placeholder which is displayed when no selections have been made yet.
+    ///
+    /// @return the placeholder which is displayed when no selections have been made yet
     String placeholder() default "";
 
-    /**
-     * The minimum amount of values a user has to select.
-     * <br>Default: {@code 1}
-     *
-     * <p>The minimum must not exceed the amount of available options.
-     *
-     * @return the minimum amount of values a user has to select
-     */
+    /// The minimum amount of values a user has to select.
+    ///
+    /// Default: `1`
+    ///
+    /// The minimum must not exceed the amount of available options.
+    ///
+    /// @return the minimum amount of values a user has to select
     int minValue() default 1;
 
-    /**
-     * The maximum amount of values a user can select.
-     * <br>Default: {@code 1}
-     *
-     * <p>The maximum must not exceed the amount of available options.
-     *
-     * @return the maximum amount of values a user can select
-     */
+    /// The maximum amount of values a user can select.
+    ///
+    /// Default: `1`
+    ///
+    /// The maximum must not exceed the amount of available options.
+    ///
+    /// @return the maximum amount of values a user can select
     int maxValue() default 1;
 
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Interaction.java b/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Interaction.java
index 32c010799..4af52daf6 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Interaction.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Interaction.java
@@ -22,17 +22,13 @@
 ///     }
 /// }
 /// ```
-///
-/// @since 4.0.0
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)
 public @interface Interaction {
 
-    /**
-     * Returns the base name for slash commands.
-     *
-     * @return the base name for slash commands
-     */
+    /// Returns the base name for slash commands.
+    ///
+    /// @return the base name for slash commands
     String value() default "";
 
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Modal.java b/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Modal.java
index a9d86b105..ca56dbfbe 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Modal.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Modal.java
@@ -19,19 +19,15 @@
 /// @Modal("My Modal")
 /// public void onModal(ModalEvent event, @TextInput("Type here") String input) { ... }
 /// ```
-///
 /// @see Interaction
 /// @see TextInput
-/// @since 4.0.0
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)
 public @interface Modal {
 
-    /**
-     * Gets the title of this modal.
-     *
-     * @return the title of the modal
-     */
+    /// Gets the title of this modal.
+    ///
+    /// @return the title of the modal
     String value();
 
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Optional.java b/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Optional.java
index 0e5fc05b6..ecf9c1860 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Optional.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Optional.java
@@ -1,33 +1,28 @@
 package com.github.kaktushose.jda.commands.annotations.interactions;
 
+import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapterRegistry;
+
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-/**
- * Parameters annotated with Optional are as the name says optional.
- *
- * <p>More formally if a command has an optional parameter the argument doesn't need to be present to execute the
- * command.
- *
- * <p>It is also possible to pass a default value which will be used instead if the argument isn't present.
- * The default value will be handled as a normal input and thus the
- * {@link com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapterRegistry TypeAdapterRegistry}
- * will try to parse it. If the parsing fails the command will still be executed but with empty or
- * possible {@code null} values.
- *
- * @see SlashCommand
- * @since 1.0.0
- */
+/// Parameters annotated with Optional are as the name says optional.
+///
+/// More formally if a command has an optional parameter the argument doesn't need to be present to execute the
+/// command.
+///
+/// It is also possible to pass a default value which will be used instead if the argument isn't present.
+/// The default value will be handled as a normal input and thus the [TypeAdapterRegistry] will try to parse it.
+/// If the parsing fails the command will still be executed but with empty or possible `null` values.
+///
+/// @see SlashCommand
 @Target(ElementType.PARAMETER)
 @Retention(RetentionPolicy.RUNTIME)
 public @interface Optional {
 
-    /**
-     * Returns the default value.
-     *
-     * @return the default value
-     */
+    /// Returns the default value.
+    ///
+    /// @return the default value
     String value() default "";
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Param.java b/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Param.java
index 43077100f..97fdff79d 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Param.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Param.java
@@ -5,29 +5,22 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-/**
- * Annotation used to add a name and description to slash command parameters.
- *
- * @see SlashCommand
- * @since 2.3.0
- */
+/// Annotation used to add a name and description to slash command parameters.
+///
+/// @see SlashCommand
 @Target(ElementType.PARAMETER)
 @Retention(RetentionPolicy.RUNTIME)
 public @interface Param {
 
-    /**
-     * Returns the description of the parameter. This value will only be used for slash commands.
-     *
-     * @return the description of the parameter
-     */
+    /// Returns the description of the parameter. This value will only be used for slash commands.
+    ///
+    /// @return the description of the parameter
     String value() default "";
 
-    /**
-     * Returns the name of the parameter. Use the compiler flag {@code -parameters} to have the parameter name resolved
-     * at runtime making this field redundant.
-     *
-     * @return the name of the parameter
-     */
+    /// Returns the name of the parameter. Use the compiler flag `-parameters` to have the parameter name resolved
+    /// at runtime making this field redundant.
+    ///
+    /// @return the name of the parameter
     String name() default "";
 
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Permissions.java b/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Permissions.java
index 792a564a8..99940d58d 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Permissions.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Permissions.java
@@ -1,33 +1,38 @@
 package com.github.kaktushose.jda.commands.annotations.interactions;
 
+import com.github.kaktushose.jda.commands.dispatching.middleware.impl.PermissionsMiddleware;
+import com.github.kaktushose.jda.commands.permissions.PermissionsProvider;
+import net.dv8tion.jda.api.Permission;
+
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-/**
- * {@link com.github.kaktushose.jda.commands.annotations.interactions.Interaction Interaction} classes or
- * interaction methods (commands, components or modals) annotated with Permission will
- * require the user to have the given permissions in order to execute the command.
- *
- * <p>The default implementation of this framework can only handle discord permissions.
- * However, the {@link com.github.kaktushose.jda.commands.permissions.PermissionsProvider PermissionsProvider} interface
- * allows custom implementations.
- *
- * <p>If a class is annotated with Permission all methods or respectively all interactions will require the given
- * permission level.
- *
- * @see com.github.kaktushose.jda.commands.permissions.PermissionsProvider PermissionsProvider
- * @since 1.0.0
- */
+/// [Interaction] classes or
+/// interaction methods (commands, components or modals) annotated with Permission will
+/// require the user to have the given permissions in order to execute the command.
+///
+/// @apiNote This annotation should not be confused with [SlashCommand#enabledFor()] or [ContextCommand#enabledFor()].
+/// The `enabledFor` permissions will be client-side checked by Discord directly, while the [Permissions] annotation
+/// will be used for the own permission system of jda-commands.
+/// @implNote The [PermissionsMiddleware] will validate the permissions during the middleware phase of the execution
+/// chain. The [PermissionsProvider] will be called to check the respective user. The default implementation of the
+/// [PermissionsProvider] can only handle Discord permissions([Permission]).
+///
+/// ## Example:
+/// ```
+/// @Permissions("BAN_MEMBERS")
+/// public class BanCommand { ... }
+/// ```
+///
+/// @see PermissionsProvider
 @Target({ElementType.METHOD, ElementType.TYPE})
 @Retention(RetentionPolicy.RUNTIME)
 public @interface Permissions {
 
-    /**
-     * Returns a String array of all required permissions.
-     *
-     * @return a String array of all required permissions.
-     */
+    /// Returns a String array of all required permissions.
+    ///
+    /// @return a String array of all required permissions.
     String[] value();
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/ReplyConfig.java b/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/ReplyConfig.java
index d624a0b74..6189759b6 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/ReplyConfig.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/ReplyConfig.java
@@ -26,7 +26,6 @@
 /// 4. [GlobalReplyConfig]
 ///
 /// @see ReplyableEvent
-/// @since 4.0.0
 @Target({ElementType.TYPE, ElementType.METHOD})
 @Retention(RetentionPolicy.RUNTIME)
 public @interface ReplyConfig {
diff --git a/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/SelectOption.java b/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/SelectOption.java
index de03b476e..e1b7f26c3 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/SelectOption.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/SelectOption.java
@@ -5,51 +5,38 @@
 
 import java.lang.annotation.*;
 
-/**
- * Used to define {@link net.dv8tion.jda.api.interactions.components.selections.SelectOption SelectOptions}
- * for {@link StringSelectMenu StringSelectMenus}.
- *
- * @see StringSelectMenu
- * @since 4.0.0
- */
+/// Used to define [`SelectOptions`][net.dv8tion.jda.api.interactions.components.selections.SelectOption]
+/// for [StringSelectMenu]s.
+///
+/// @see StringSelectMenu
 @Repeatable(SelectOptionContainer.class)
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)
 public @interface SelectOption {
 
-    /**
-     * Gets the label of an option.
-     *
-     * @return the label
-     */
+    /// Gets the label of an option.
+    ///
+    /// @return the label
     String label();
 
-    /**
-     * Gets the value of an option.
-     *
-     * @return the value
-     */
+    /// Gets the value of an option.
+    ///
+    /// @return the value
     String value();
 
-    /**
-     * Gets the description of an option.
-     *
-     * @return the description
-     */
+    /// Gets the description of an option.
+    ///
+    /// @return the description
     String description() default "";
 
-    /**
-     * Gets the {@link Emoji} of an option.
-     *
-     * @return the {@link Emoji}
-     */
+    /// Gets the [Emoji] of an option.
+    ///
+    /// @return the [Emoji]
     String emoji() default "";
 
-    /**
-     * Gets whether this option is a default option.
-     *
-     * @return {@code true} if this SelectOption is a default option
-     */
+    /// Gets whether this option is a default option.
+    ///
+    /// @return `true` if this SelectOption is a default option
     boolean isDefault() default false;
 
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/SlashCommand.java b/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/SlashCommand.java
index 177f3786d..de40f4898 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/SlashCommand.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/SlashCommand.java
@@ -37,72 +37,47 @@
 /// public void onCommand(CommandEvent event, String[] arguments) {}
 /// }
 /// ```
-///
 /// @see Interaction
 /// @see com.github.kaktushose.jda.commands.annotations.interactions.Interaction Interaction
 /// @see com.github.kaktushose.jda.commands.annotations.constraints.Constraint Constraint
-/// @since 1.0.0
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)
 public @interface SlashCommand {
 
-    /**
-     * Returns the name of the command.
-     *
-     * @return the name of the command
-     */
+    /// Returns the name of the command.
+    ///
+    /// @return the name of the command
     String value() default "";
 
-    /**
-     * Returns whether this command is only usable in a guild.
-     * This only has an effect if this command is registered globally.
-     *
-     * @return {@code true} if this command is only usable in a guild
-     */
+    /// Returns whether this command is only usable in a guild.
+    /// This only has an effect if this command is registered globally.
+    ///
+    /// @return `true` if this command is only usable in a guild
     boolean isGuildOnly() default false;
 
-    /**
-     * Returns the description of the command.
-     *
-     * @return the description of the command
-     */
+    /// Returns the description of the command.
+    ///
+    /// @return the description of the command
     String desc() default "N/A";
 
-    /**
-     * Returns whether this command can only be executed in NSFW channels.
-     *
-     * @return {@code true} if this command can only be executed in NSFW channels
-     */
+    /// Returns whether this command can only be executed in NSFW channels.
+    ///
+    /// @return `true` if this command can only be executed in NSFW channels
     boolean isNSFW() default false;
 
-    /**
-     * Returns an array of {@link net.dv8tion.jda.api.Permission Permissions} this command
-     * should be enabled for by default. Note that guild admins can modify this at any time.
-     *
-     * @return an array of permissions this command will be enabled for by default
-     * @see Permissions Permission
-     * @see net.dv8tion.jda.api.interactions.commands.DefaultMemberPermissions DefaultMemberPermissions.ENABLED
-     * @see net.dv8tion.jda.api.interactions.commands.DefaultMemberPermissions DefaultMemberPermissions.DISABLED
-     */
+    /// Returns an array of [Permission]s this command should be enabled for by default. Note that guild admins can
+    /// modify this at any time.
+    ///
+    /// @return an array of permissions this command will be enabled for by default
+    /// @see Permissions Permission
+    /// @see net.dv8tion.jda.api.interactions.commands.DefaultMemberPermissions DefaultMemberPermissions.ENABLED
+    /// @see net.dv8tion.jda.api.interactions.commands.DefaultMemberPermissions DefaultMemberPermissions.DISABLED
     Permission[] enabledFor() default Permission.UNKNOWN;
 
-    /**
-     * Returns whether this command should be registered as a global or as a guild command.
-     *
-     * @return whether this command should be registered as a global or as a guild command
-     * @see CommandScope
-     */
+    /// Returns whether this command should be registered as a global or as a guild command.
+    ///
+    /// @return whether this command should be registered as a global or as a guild command
+    /// @see CommandScope
     CommandScope scope() default CommandScope.GLOBAL;
 
-    /**
-     * Enum describing the two possible scopes a command can be registered for.
-     *
-     * @see SlashCommand#scope()
-     * @since 4.0.0
-     */
-    enum CommandScope {
-        GUILD,
-        GLOBAL
-    }
-
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/StringSelectMenu.java b/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/StringSelectMenu.java
index 688f622a6..73ce8ce78 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/StringSelectMenu.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/StringSelectMenu.java
@@ -31,36 +31,31 @@
 /// ```
 /// @see Interaction
 /// @see SelectOption
-/// @since 4.0.0
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)
 public @interface StringSelectMenu {
 
-    /**
-     * Configure the placeholder which is displayed when no selections have been made yet.
-     *
-     * @return the placeholder which is displayed when no selections have been made yet
-     */
+    /// Configure the placeholder which is displayed when no selections have been made yet.
+    ///
+    /// @return the placeholder which is displayed when no selections have been made yet
     String value();
 
-    /**
-     * The minimum amount of values a user has to select.
-     * <br>Default: {@code 1}
-     *
-     * <p>The minimum must not exceed the amount of available options.
-     *
-     * @return the minimum amount of values a user has to select
-     */
+    /// The minimum amount of values a user has to select.
+    ///
+    /// Default: `1`
+    ///
+    /// The minimum must not exceed the amount of available options.
+    ///
+    /// @return the minimum amount of values a user has to select
     int minValue() default 1;
 
-    /**
-     * The maximum amount of values a user can select.
-     * <br>Default: {@code 1}
-     *
-     * <p>The maximum must not exceed the amount of available options.
-     *
-     * @return the maximum amount of values a user can select
-     */
+    /// The maximum amount of values a user can select.
+    ///
+    /// Default: `1`
+    ///
+    /// The maximum must not exceed the amount of available options.
+    ///
+    /// @return the maximum amount of values a user can select
     int maxValue() default 1;
 
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/TextInput.java b/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/TextInput.java
index c1de71bc1..156b597b1 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/TextInput.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/TextInput.java
@@ -7,67 +7,53 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-/**
- * Annotation used to add TextInputs to {@link Modal Modals}.
- *
- * @see Modal
- * @since 4.0.0
- */
+/// Annotation used to add TextInputs to [Modal]s.
+///
+/// @see Modal
 @Target(ElementType.PARAMETER)
 @Retention(RetentionPolicy.RUNTIME)
 public @interface TextInput {
 
-    /**
-     * The placeholder of this TextInput
-     * <br>This is the short hint that describes the expected value of the TextInput field.
-     *
-     * @return Placeholder
-     */
+    /// The placeholder of this TextInput
+    ///
+    /// This is the short hint that describes the expected value of the TextInput field.
+    ///
+    /// @return Placeholder
     String value();
 
-    /**
-     * The label shown above this text input box
-     *
-     * @return Label for the input
-     */
+    /// The label shown above this text input box
+    ///
+    /// @return Label for the input
     String label() default "";
 
-    /**
-     * The default value of this TextInput.
-     * <br>This sets a pre-populated text for this TextInput field
-     *
-     * @return default value
-     */
+    /// The default value of this TextInput.
+    ///
+    /// This sets a pre-populated text for this TextInput field
+    ///
+    /// @return default value
     String defaultValue() default "";
 
-    /**
-     * The minimum length. This is -1 if none has been set.
-     *
-     * @return Minimum length or -1
-     */
+    /// The minimum length. This is -1 if none has been set.
+    ///
+    /// @return Minimum length or -1
     int minValue() default -1;
 
-    /**
-     * The maximum length. This is -1 if none has been set.
-     *
-     * @return Maximum length or -1
-     */
+    /// The maximum length. This is -1 if none has been set.
+    ///
+    /// @return Maximum length or -1
     int maxValue() default -1;
 
-    /**
-     * The {@link TextInputStyle TextInputStyle}. The default value is {@link TextInputStyle#PARAGRAPH}.
-     *
-     * @return The TextInputStyle
-     */
+    /// The [TextInputStyle]. The default value is [TextInputStyle#PARAGRAPH].
+    ///
+    /// @return The TextInputStyle
     TextInputStyle style() default TextInputStyle.PARAGRAPH;
 
-    /**
-     * Whether this TextInput is required.
-     * <br>If this is True, the user must populate this TextInput field before they can submit the Modal.
-     *
-     * @return True if this TextInput is required
-     * @see net.dv8tion.jda.api.interactions.components.text.TextInput#isRequired()
-     */
+    /// Whether this TextInput is required.
+    ///
+    /// If this is True, the user must populate this TextInput field before they can submit the Modal.
+    ///
+    /// @return True if this TextInput is required
+    /// @see net.dv8tion.jda.api.interactions.components.text.TextInput#isRequired()
     boolean required() default true;
 
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/annotations/internal/SelectOptionContainer.java b/src/main/java/com/github/kaktushose/jda/commands/annotations/internal/SelectOptionContainer.java
index beab34365..83866dd03 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/annotations/internal/SelectOptionContainer.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/annotations/internal/SelectOptionContainer.java
@@ -1,20 +1,19 @@
 package com.github.kaktushose.jda.commands.annotations.internal;
 
 import com.github.kaktushose.jda.commands.annotations.interactions.SelectOption;
+import org.jetbrains.annotations.ApiStatus;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-/**
- * Internal wrapper for repeating {@link SelectOption SelectOptions}.
- *
- * @see SelectOption
- * @since 4.0.0
- */
+/// Internal wrapper for repeating [SelectOption]s.
+///
+/// @see SelectOption
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)
+@ApiStatus.Internal
 public @interface SelectOptionContainer {
 
     SelectOption[] value();
diff --git a/src/main/java/com/github/kaktushose/jda/commands/annotations/internal/package-info.java b/src/main/java/com/github/kaktushose/jda/commands/annotations/internal/package-info.java
index 91bae5373..7c13bc512 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/annotations/internal/package-info.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/annotations/internal/package-info.java
@@ -1,4 +1,2 @@
-/**
- * Annotations that are only used for internal purposes and aren't intended to use in production.
- */
+/// Annotations that are only used for internal purposes and aren't intended to use in production.
 package com.github.kaktushose.jda.commands.annotations.internal;
diff --git a/src/main/java/com/github/kaktushose/jda/commands/annotations/package-info.java b/src/main/java/com/github/kaktushose/jda/commands/annotations/package-info.java
index 9b50e4c46..9485e3173 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/annotations/package-info.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/annotations/package-info.java
@@ -1,4 +1,2 @@
-/**
- * All annotations that are needed to use this framework.
- */
+/// All annotations that are needed to use this framework.
 package com.github.kaktushose.jda.commands.annotations;
diff --git a/src/main/java/com/github/kaktushose/jda/commands/definitions/Definition.java b/src/main/java/com/github/kaktushose/jda/commands/definitions/Definition.java
new file mode 100644
index 000000000..a1ec7cca8
--- /dev/null
+++ b/src/main/java/com/github/kaktushose/jda/commands/definitions/Definition.java
@@ -0,0 +1,27 @@
+package com.github.kaktushose.jda.commands.definitions;
+
+import com.github.kaktushose.jda.commands.definitions.features.CustomIdJDAEntity;
+import com.github.kaktushose.jda.commands.definitions.features.JDAEntity;
+import com.github.kaktushose.jda.commands.definitions.features.internal.Invokable;
+import com.github.kaktushose.jda.commands.definitions.interactions.InteractionDefinition;
+import com.github.kaktushose.jda.commands.definitions.interactions.ModalDefinition;
+import com.github.kaktushose.jda.commands.definitions.interactions.command.ParameterDefinition;
+import com.github.kaktushose.jda.commands.definitions.interactions.command.SlashCommandDefinition;
+import com.github.kaktushose.jda.commands.definitions.interactions.component.menu.StringSelectMenuDefinition;
+import org.jetbrains.annotations.NotNull;
+
+/// The common interface for all interaction definitions and their sub parts, such as parameters or text inputs, etc.
+public sealed interface Definition permits CustomIdJDAEntity, Invokable, JDAEntity, InteractionDefinition,
+        ModalDefinition.TextInputDefinition, ParameterDefinition, ParameterDefinition.ConstraintDefinition,
+        SlashCommandDefinition.CooldownDefinition, StringSelectMenuDefinition.SelectOptionDefinition {
+
+    /// The id for this definition. Per default this is the hash code of the [#toString()] method.
+    @NotNull
+    default String definitionId() {
+        return String.valueOf(toString().hashCode());
+    }
+
+    /// The human-readable name of this definition.
+    @NotNull
+    String displayName();
+}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/definitions/description/ClassDescription.java b/src/main/java/com/github/kaktushose/jda/commands/definitions/description/ClassDescription.java
new file mode 100644
index 000000000..e64468bc6
--- /dev/null
+++ b/src/main/java/com/github/kaktushose/jda/commands/definitions/description/ClassDescription.java
@@ -0,0 +1,19 @@
+package com.github.kaktushose.jda.commands.definitions.description;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.lang.annotation.Annotation;
+import java.util.Collection;
+
+/// A [Description] that describes a class.
+///
+/// @param clazz       the [Class] this [Description] describes.
+/// @param name        the name of the class
+/// @param annotations a [Collection] of all [Annotation]s this class is annotated with
+/// @param methods     a [Collection] of all the public [`methods`][MethodDescription] of this class
+public record ClassDescription(
+        @NotNull Class<?> clazz,
+        @NotNull String name,
+        @NotNull Collection<Annotation> annotations,
+        @NotNull Collection<MethodDescription> methods
+) implements Description {}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/definitions/description/Description.java b/src/main/java/com/github/kaktushose/jda/commands/definitions/description/Description.java
new file mode 100644
index 000000000..a12c469d7
--- /dev/null
+++ b/src/main/java/com/github/kaktushose/jda/commands/definitions/description/Description.java
@@ -0,0 +1,31 @@
+package com.github.kaktushose.jda.commands.definitions.description;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.lang.annotation.Annotation;
+import java.util.Collection;
+import java.util.Optional;
+
+/// The common interface of all [Description] types.
+///
+/// A [Description] is, as the name says, a description of a class, method or parameter, similar to how
+/// `java.lang.reflect` works.
+///
+/// @see ClassDescription
+/// @see MethodDescription
+/// @see ParameterDescription
+public sealed interface Description permits ClassDescription, MethodDescription, ParameterDescription {
+
+    /// a possibly-empty [Collection] of all [Annotation]s this element is annotated with.
+    @NotNull
+    Collection<Annotation> annotations();
+
+    /// Gets this element's [Annotation] for the specified type if such an annotation is present
+    ///
+    /// @param type the type of the annotation to get
+    /// @return an [Optional] holding the [Annotation] if present at this element or else an empty [Optional]
+    @NotNull
+    default <T extends Annotation> Optional<T> annotation(@NotNull Class<T> type) {
+        return annotations().stream().filter(type::isInstance).map(type::cast).findFirst();
+    }
+}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/definitions/description/Descriptor.java b/src/main/java/com/github/kaktushose/jda/commands/definitions/description/Descriptor.java
new file mode 100644
index 000000000..34fdcd01b
--- /dev/null
+++ b/src/main/java/com/github/kaktushose/jda/commands/definitions/description/Descriptor.java
@@ -0,0 +1,8 @@
+package com.github.kaktushose.jda.commands.definitions.description;
+
+import java.util.function.Function;
+
+/// A [Descriptor] takes a [Class] as input and transforms it into a [ClassDescription].
+@FunctionalInterface
+public interface Descriptor extends Function<Class<?>, ClassDescription> {
+}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/definitions/description/Invoker.java b/src/main/java/com/github/kaktushose/jda/commands/definitions/description/Invoker.java
new file mode 100644
index 000000000..0d956aa54
--- /dev/null
+++ b/src/main/java/com/github/kaktushose/jda/commands/definitions/description/Invoker.java
@@ -0,0 +1,20 @@
+package com.github.kaktushose.jda.commands.definitions.description;
+
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.SequencedCollection;
+
+/// A functional interface, that allows the invocation of a [MethodDescription].
+@FunctionalInterface
+public interface Invoker {
+
+    /// @param instance  an instance of the declaring class of the method
+    /// @param arguments a [SequencedCollection] of the arguments the method should be invoked with
+    /// @return the result of the method invocation
+    /// @throws IllegalAccessException    if this Method object is enforcing Java language access control and the
+    ///                                   underlying method is inaccessible
+    /// @throws InvocationTargetException if an exception was thrown by the invoked method or constructor
+    @Nullable Object invoke(@NotNull Object instance, @NotNull SequencedCollection<Object> arguments) throws IllegalAccessException, InvocationTargetException;
+}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/definitions/description/MethodDescription.java b/src/main/java/com/github/kaktushose/jda/commands/definitions/description/MethodDescription.java
new file mode 100644
index 000000000..acc28bcc2
--- /dev/null
+++ b/src/main/java/com/github/kaktushose/jda/commands/definitions/description/MethodDescription.java
@@ -0,0 +1,25 @@
+package com.github.kaktushose.jda.commands.definitions.description;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.lang.annotation.Annotation;
+import java.util.Collection;
+import java.util.SequencedCollection;
+
+/// A [Description] that describes a method.
+///
+/// @param declaringClass the declaring [Class] of this method
+/// @param returnType     the [Class] this method returns
+/// @param name           the name of the method
+/// @param parameters     a [SequencedCollection] of the [ParameterDescription]s of this method
+/// @param annotations    a [Collection] of all [Annotation]s this method is annotated with
+/// @param invoker        the corresponding [Invoker], used to invoke this method
+public record MethodDescription(
+        @NotNull Class<?> declaringClass,
+        @NotNull Class<?> returnType,
+        @NotNull String name,
+        @NotNull SequencedCollection<ParameterDescription> parameters,
+        @NotNull Collection<Annotation> annotations,
+        @NotNull Invoker invoker
+) implements Description {
+}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/definitions/description/ParameterDescription.java b/src/main/java/com/github/kaktushose/jda/commands/definitions/description/ParameterDescription.java
new file mode 100644
index 000000000..3816c2273
--- /dev/null
+++ b/src/main/java/com/github/kaktushose/jda/commands/definitions/description/ParameterDescription.java
@@ -0,0 +1,17 @@
+package com.github.kaktushose.jda.commands.definitions.description;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.lang.annotation.Annotation;
+import java.util.Collection;
+
+/// A [Description] that describes a parameter.
+///
+/// @param type        the [Class] representing the type of this parameter
+/// @param name        the name of the parameter
+/// @param annotations a [Collection] of all [Annotation]s this parameter is annotated with
+public record ParameterDescription(
+        @NotNull Class<?> type,
+        @NotNull String name,
+        @NotNull Collection<Annotation> annotations
+) implements Description {}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/definitions/description/package-info.java b/src/main/java/com/github/kaktushose/jda/commands/definitions/description/package-info.java
new file mode 100644
index 000000000..da7dd094b
--- /dev/null
+++ b/src/main/java/com/github/kaktushose/jda/commands/definitions/description/package-info.java
@@ -0,0 +1,6 @@
+/// This packages includes different types of [`Descriptions`][com.github.kaktushose.jda.commands.definitions.description.Description]
+/// that contain meta information about classes, methods und parameters, similar to reflections.
+///
+/// Descriptions are created by an implementation of [`Descriptions`][com.github.kaktushose.jda.commands.definitions.description.Description]
+/// and are used in many places of this framework, resulting in the possible avoidance of java reflections.
+package com.github.kaktushose.jda.commands.definitions.description;
diff --git a/src/main/java/com/github/kaktushose/jda/commands/definitions/description/reflective/ReflectiveClassFinder.java b/src/main/java/com/github/kaktushose/jda/commands/definitions/description/reflective/ReflectiveClassFinder.java
new file mode 100644
index 000000000..3da9ea859
--- /dev/null
+++ b/src/main/java/com/github/kaktushose/jda/commands/definitions/description/reflective/ReflectiveClassFinder.java
@@ -0,0 +1,28 @@
+package com.github.kaktushose.jda.commands.definitions.description.reflective;
+
+import com.github.kaktushose.jda.commands.annotations.interactions.Interaction;
+import org.jetbrains.annotations.ApiStatus;
+import org.reflections.Reflections;
+import org.reflections.scanners.Scanners;
+import org.reflections.util.ClasspathHelper;
+import org.reflections.util.ConfigurationBuilder;
+import org.reflections.util.FilterBuilder;
+
+// temp class
+@ApiStatus.Internal
+public class ReflectiveClassFinder {
+
+    public static Iterable<Class<?>> find(Class<?> clazz, String[] packages) {
+        var filter = new FilterBuilder();
+        for (String pkg : packages) {
+            filter.includePackage(pkg);
+        }
+
+        var config = new ConfigurationBuilder()
+                .setScanners(Scanners.SubTypes, Scanners.TypesAnnotated)
+                .setUrls(ClasspathHelper.forClass(clazz))
+                .filterInputsBy(filter);
+        var reflections = new Reflections(config);
+        return reflections.getTypesAnnotatedWith(Interaction.class);
+    }
+}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/definitions/description/reflective/ReflectiveDescriptor.java b/src/main/java/com/github/kaktushose/jda/commands/definitions/description/reflective/ReflectiveDescriptor.java
new file mode 100644
index 000000000..f289f3d9d
--- /dev/null
+++ b/src/main/java/com/github/kaktushose/jda/commands/definitions/description/reflective/ReflectiveDescriptor.java
@@ -0,0 +1,72 @@
+package com.github.kaktushose.jda.commands.definitions.description.reflective;
+
+import com.github.kaktushose.jda.commands.definitions.description.ClassDescription;
+import com.github.kaktushose.jda.commands.definitions.description.Descriptor;
+import com.github.kaktushose.jda.commands.definitions.description.MethodDescription;
+import com.github.kaktushose.jda.commands.definitions.description.ParameterDescription;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.lang.reflect.Parameter;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.Objects;
+
+/// An [Descriptor] implementation that uses `java.lang.reflect` to create the [ClassDescription].
+public class ReflectiveDescriptor implements Descriptor {
+
+    /// Transforms the given [Class] into a [ClassDescription].
+    ///
+    /// @param clazz the [Class] to transform
+    /// @return the [ClassDescription] built from the given [Class]
+    @NotNull
+    @Override
+    public ClassDescription apply(@NotNull Class<?> clazz) {
+        List<MethodDescription> methods = Arrays.stream(clazz.getMethods())
+                .map(this::method)
+                .filter(Objects::nonNull)
+                .toList();
+
+        return new ClassDescription(
+                clazz,
+                clazz.getName(),
+                toList(clazz.getAnnotations()),
+                methods
+        );
+    }
+
+    @Nullable
+    private MethodDescription method(@NotNull Method method) {
+        if (!Modifier.isPublic(method.getModifiers())) return null;
+        List<ParameterDescription> parameters = Arrays.stream(method.getParameters())
+                .map(this::parameter)
+                .toList();
+
+
+        return new MethodDescription(
+                method.getDeclaringClass(),
+                method.getReturnType(),
+                method.getName(),
+                parameters,
+                toList(method.getAnnotations()),
+                (instance, arguments) -> method.invoke(instance, arguments.toArray())
+        );
+    }
+
+    @NotNull
+    private ParameterDescription parameter(@NotNull Parameter parameter) {
+        return new ParameterDescription(
+                parameter.getType(),
+                parameter.getName(),
+                toList(parameter.getAnnotations())
+        );
+    }
+
+    @NotNull
+    private <T> Collection<T> toList(@NotNull T[] array) {
+        return Arrays.stream(array).toList();
+    }
+}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/definitions/description/reflective/package-info.java b/src/main/java/com/github/kaktushose/jda/commands/definitions/description/reflective/package-info.java
new file mode 100644
index 000000000..1a7e340de
--- /dev/null
+++ b/src/main/java/com/github/kaktushose/jda/commands/definitions/description/reflective/package-info.java
@@ -0,0 +1,3 @@
+/// Contains [`Descriptors`][com.github.kaktushose.jda.commands.definitions.description.Descriptor] that use
+/// `java.lang.reflect` to build [`Descriptions][com.github.kaktushose.jda.commands.definitions.description.Description].
+package com.github.kaktushose.jda.commands.definitions.description.reflective;
diff --git a/src/main/java/com/github/kaktushose/jda/commands/definitions/features/CustomIdJDAEntity.java b/src/main/java/com/github/kaktushose/jda/commands/definitions/features/CustomIdJDAEntity.java
new file mode 100644
index 000000000..b4d76995a
--- /dev/null
+++ b/src/main/java/com/github/kaktushose/jda/commands/definitions/features/CustomIdJDAEntity.java
@@ -0,0 +1,27 @@
+package com.github.kaktushose.jda.commands.definitions.features;
+
+import com.github.kaktushose.jda.commands.definitions.Definition;
+import com.github.kaktushose.jda.commands.definitions.interactions.CustomId;
+import com.github.kaktushose.jda.commands.definitions.interactions.ModalDefinition;
+import com.github.kaktushose.jda.commands.definitions.interactions.component.ButtonDefinition;
+import com.github.kaktushose.jda.commands.definitions.interactions.component.ComponentDefinition;
+import com.github.kaktushose.jda.commands.definitions.interactions.component.menu.EntitySelectMenuDefinition;
+import com.github.kaktushose.jda.commands.definitions.interactions.component.menu.StringSelectMenuDefinition;
+import org.jetbrains.annotations.NotNull;
+
+/// Indicates that the implementing [Definition] can be transformed into a JDA entity that has a [CustomId].
+///
+/// @see ButtonDefinition
+/// @see EntitySelectMenuDefinition
+/// @see StringSelectMenuDefinition
+/// @see ModalDefinition
+public sealed interface CustomIdJDAEntity<T> extends Definition permits ComponentDefinition, ModalDefinition {
+
+    /// Transforms this [Definition] into a JDA entity of the given type [T].
+    ///
+    /// @param customId the [CustomId] to use to build this JDA entity
+    /// @return a JDA entity of type [T]
+    @NotNull
+    T toJDAEntity(@NotNull CustomId customId);
+
+}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/definitions/features/JDAEntity.java b/src/main/java/com/github/kaktushose/jda/commands/definitions/features/JDAEntity.java
new file mode 100644
index 000000000..dd2fd6202
--- /dev/null
+++ b/src/main/java/com/github/kaktushose/jda/commands/definitions/features/JDAEntity.java
@@ -0,0 +1,35 @@
+package com.github.kaktushose.jda.commands.definitions.features;
+
+import com.github.kaktushose.jda.commands.definitions.Definition;
+import com.github.kaktushose.jda.commands.definitions.interactions.ModalDefinition.TextInputDefinition;
+import com.github.kaktushose.jda.commands.definitions.interactions.command.CommandDefinition;
+import com.github.kaktushose.jda.commands.definitions.interactions.command.ContextCommandDefinition;
+import com.github.kaktushose.jda.commands.definitions.interactions.command.ParameterDefinition;
+import com.github.kaktushose.jda.commands.definitions.interactions.command.SlashCommandDefinition;
+import com.github.kaktushose.jda.commands.definitions.interactions.component.ButtonDefinition;
+import com.github.kaktushose.jda.commands.definitions.interactions.component.ComponentDefinition;
+import com.github.kaktushose.jda.commands.definitions.interactions.component.menu.EntitySelectMenuDefinition;
+import com.github.kaktushose.jda.commands.definitions.interactions.component.menu.StringSelectMenuDefinition;
+import com.github.kaktushose.jda.commands.definitions.interactions.component.menu.StringSelectMenuDefinition.SelectOptionDefinition;
+import org.jetbrains.annotations.NotNull;
+
+/// Indicates that the implementing [Definition] can be transformed into a JDA entity.
+///
+/// @see ButtonDefinition
+/// @see EntitySelectMenuDefinition
+/// @see StringSelectMenuDefinition
+/// @see SlashCommandDefinition
+/// @see ContextCommandDefinition
+/// @see ParameterDefinition
+/// @see SelectOptionDefinition
+/// @see TextInputDefinition
+public sealed interface JDAEntity<T> extends Definition
+        permits ComponentDefinition, TextInputDefinition, CommandDefinition, ParameterDefinition, SelectOptionDefinition {
+
+    /// Transforms this [Definition] into a JDA entity of the given type [T].
+    ///
+    /// @return a JDA entity of type [T]
+    @NotNull
+    T toJDAEntity();
+
+}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/definitions/features/internal/Invokable.java b/src/main/java/com/github/kaktushose/jda/commands/definitions/features/internal/Invokable.java
new file mode 100644
index 000000000..0ee833dae
--- /dev/null
+++ b/src/main/java/com/github/kaktushose/jda/commands/definitions/features/internal/Invokable.java
@@ -0,0 +1,51 @@
+package com.github.kaktushose.jda.commands.definitions.features.internal;
+
+import com.github.kaktushose.jda.commands.definitions.Definition;
+import com.github.kaktushose.jda.commands.definitions.description.ClassDescription;
+import com.github.kaktushose.jda.commands.definitions.description.MethodDescription;
+import com.github.kaktushose.jda.commands.definitions.interactions.InteractionDefinition;
+import com.github.kaktushose.jda.commands.dispatching.context.InvocationContext;
+import com.github.kaktushose.jda.commands.dispatching.handling.EventHandler;
+import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.SequencedCollection;
+
+/// Indicates that the implementing [Definition] is bound to a method that can be invoked.
+@ApiStatus.Internal
+public sealed interface Invokable extends Definition permits InteractionDefinition {
+
+    Logger log = LoggerFactory.getLogger(Invokable.class);
+
+    /// Invokes the method that this [Definition] is bound to.
+    ///
+    /// @param instance   an instance of the declaring class of the method
+    /// @param invocation the corresponding [InvocationContext]
+    /// @return the result of the method invocation
+    /// @throws IllegalStateException     if the definition must not be invoked at the moment this method gets called
+    /// @throws IllegalAccessException    if the method object is enforcing Java language access control and the
+    ///                                   underlying method is inaccessible
+    /// @throws InvocationTargetException if an exception was thrown by the invoked method or constructor
+    @Nullable
+    default Object invoke(@NotNull Object instance, @NotNull InvocationContext<?> invocation) throws IllegalAccessException, InvocationTargetException {
+        if (!EventHandler.INVOCATION_PERMITTED.get()) {
+            throw new IllegalStateException("The Definition must not be invoked at this point.");
+        }
+        SequencedCollection<Object> arguments = invocation.arguments();
+
+        EventHandler.INVOCATION_PERMITTED.set(false);
+        return methodDescription().invoker().invoke(instance, arguments);
+    }
+
+    /// The [ClassDescription] of the declaring class of the [#methodDescription()].
+    @NotNull
+    ClassDescription clazzDescription();
+
+    /// The [MethodDescription] of the method this [Definition] is bound to.
+    @NotNull
+    MethodDescription methodDescription();
+}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/definitions/features/package-info.java b/src/main/java/com/github/kaktushose/jda/commands/definitions/features/package-info.java
new file mode 100644
index 000000000..d4202ea90
--- /dev/null
+++ b/src/main/java/com/github/kaktushose/jda/commands/definitions/features/package-info.java
@@ -0,0 +1,2 @@
+/// This package contains interfaces that implement some form of functionality for a definition, that not all definitions might share.
+package com.github.kaktushose.jda.commands.definitions.features;
\ No newline at end of file
diff --git a/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/AutoCompleteDefinition.java b/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/AutoCompleteDefinition.java
new file mode 100644
index 000000000..bb60afb20
--- /dev/null
+++ b/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/AutoCompleteDefinition.java
@@ -0,0 +1,51 @@
+package com.github.kaktushose.jda.commands.definitions.interactions;
+
+import com.github.kaktushose.jda.commands.annotations.interactions.AutoComplete;
+import com.github.kaktushose.jda.commands.definitions.description.ClassDescription;
+import com.github.kaktushose.jda.commands.definitions.description.MethodDescription;
+import com.github.kaktushose.jda.commands.dispatching.events.interactions.AutoCompleteEvent;
+import com.github.kaktushose.jda.commands.internal.Helpers;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+/// Representation of an auto complete handler.
+///
+/// @param clazzDescription  the [ClassDescription] of the declaring class of the [#methodDescription()]
+/// @param methodDescription the [MethodDescription] of the method this definition is bound to
+/// @param commands          the commands this autocomplete handler can handle
+public record AutoCompleteDefinition(@NotNull ClassDescription clazzDescription,
+                                     @NotNull MethodDescription methodDescription,
+                                     @NotNull Set<String> commands)
+        implements InteractionDefinition {
+
+    /// Builds a new [AutoCompleteDefinition] from the given class and method description.
+    ///
+    /// @param clazz  the corresponding [ClassDescription]
+    /// @param method the corresponding [MethodDescription]
+    /// @return an [Optional] holding the [AutoCompleteDefinition]
+    @NotNull
+    public static Optional<AutoCompleteDefinition> build(@NotNull ClassDescription clazz, @NotNull MethodDescription method) {
+        if (Helpers.checkSignature(method, List.of(AutoCompleteEvent.class))) {
+            return Optional.empty();
+        }
+        return method.annotation(AutoComplete.class).map(complete ->
+                new AutoCompleteDefinition(clazz, method, Arrays.stream(complete.value()).collect(Collectors.toSet()))
+        );
+
+    }
+
+    @NotNull
+    @Override
+    public String displayName() {
+        return "%s.%s".formatted(methodDescription.declaringClass().getName(), methodDescription.name());
+    }
+
+    @NotNull
+    @Override
+    public Collection<String> permissions() {
+        return Collections.emptyList();
+    }
+
+}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/CustomId.java b/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/CustomId.java
new file mode 100644
index 000000000..979f83798
--- /dev/null
+++ b/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/CustomId.java
@@ -0,0 +1,105 @@
+package com.github.kaktushose.jda.commands.definitions.interactions;
+
+import com.github.kaktushose.jda.commands.definitions.Definition;
+import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent;
+import net.dv8tion.jda.api.events.interaction.ModalInteractionEvent;
+import net.dv8tion.jda.api.events.interaction.component.GenericComponentInteractionCreateEvent;
+import org.jetbrains.annotations.NotNull;
+
+/// Representation of a custom id used in modals, buttons or select menus.
+///
+/// @param runtimeId    the id of the [`Runtime`]({@docRoot}/index.html#runtime-concept-heading) this custom id is bound to
+///                     or the literal `independent`.
+/// @param definitionId the [Definition#definitionId()]
+/// @implNote the custom id has the following format: `jdac.runtimeId.definitionId`
+public record CustomId(@NotNull String runtimeId, @NotNull String definitionId) {
+    private static final String PREFIX = "jdac";
+    private static final String INDEPENDENT_ID = "independent";
+    public static final String BOUND_CUSTOM_ID_REGEX = "^jdac\\.[0-9a-fA-F-]{36}\\.-?\\d+$";
+    public static final String INDEPENDENT_CUSTOM_ID_REGEX = "^jdac\\.%s\\.-?\\d+$".formatted(INDEPENDENT_ID);
+
+    public CustomId {
+        if (!runtimeId.matches("[0-9a-fA-F-]{36}") && !runtimeId.equals(INDEPENDENT_ID)) {
+            throw new IllegalArgumentException("Invalid runtime id! Must either be a UUID or \"%s\"".formatted(INDEPENDENT_ID));
+        }
+    }
+
+    /// Constructs a new [CustomId] from the given [GenericInteractionCreateEvent].
+    ///
+    /// @param event the [GenericInteractionCreateEvent]
+    /// @return the [CustomId]
+    @NotNull
+    public static CustomId fromEvent(@NotNull GenericComponentInteractionCreateEvent event) {
+        return fromEvent(event.getComponentId());
+    }
+
+    /// Constructs a new [CustomId] from the given [ModalInteractionEvent].
+    ///
+    /// @param event the [ModalInteractionEvent]
+    /// @return the [CustomId]
+    @NotNull
+    public static CustomId fromEvent(@NotNull ModalInteractionEvent event) {
+        return fromEvent(event.getModalId());
+    }
+
+    /// Constructs a new [CustomId] from the given String.
+    ///
+    /// @param customId the custom id String
+    /// @return the [CustomId]
+    @NotNull
+    private static CustomId fromEvent(@NotNull String customId) {
+        if (isInvalid(customId)) {
+            throw new IllegalArgumentException("Provided custom id is invalid!");
+        }
+        var split = customId.split("\\.");
+        return new CustomId(split[1], split[2]);
+    }
+
+    /// Constructs a new runtime-independent [CustomId] from the given definition id.
+    ///
+    /// @param definitionId the definition id to construct the [CustomId] from
+    /// @return a new runtime-independent [CustomId]
+    @NotNull
+    public static CustomId independent(@NotNull String definitionId) {
+        return new CustomId(INDEPENDENT_ID, definitionId);
+    }
+
+    /// Checks if the passed custom id *doesn't* conform to the defined format of jda-commands.
+    ///
+    /// @return `true` if the passed custom id *doesn't* conform to the jda-commands format
+    public static boolean isInvalid(@NotNull String customId) {
+        return !(customId.matches(BOUND_CUSTOM_ID_REGEX) || customId.matches(INDEPENDENT_CUSTOM_ID_REGEX));
+    }
+
+    /// The String representation of this custom id.
+    @NotNull
+    public String id() {
+        return "%s.%s.%s".formatted(PREFIX, runtimeId, definitionId);
+    }
+
+    /// Gets the runtime id of this custom id.
+    ///
+    /// @return the runtime id
+    /// @throws IllegalStateException if this custom id is runtime-independent
+    @NotNull
+    public String runtimeId() {
+        if (isIndependent()) {
+            throw new IllegalStateException("Provided custom id is runtime-independent!");
+        }
+        return runtimeId;
+    }
+
+    /// Checks if the passed custom id is runtime-independent.
+    ///
+    /// @return `true` if the custom id is runtime-independent
+    public boolean isIndependent() {
+        return runtimeId.equals(INDEPENDENT_ID);
+    }
+
+    /// Checks if the passed custom id is runtime-bound.
+    ///
+    /// @return `true` if the custom id is runtime-bound
+    public boolean isBound() {
+        return !isIndependent();
+    }
+}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/InteractionDefinition.java b/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/InteractionDefinition.java
new file mode 100644
index 000000000..4ac5c32a8
--- /dev/null
+++ b/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/InteractionDefinition.java
@@ -0,0 +1,93 @@
+package com.github.kaktushose.jda.commands.definitions.interactions;
+
+import com.github.kaktushose.jda.commands.annotations.interactions.Interaction;
+import com.github.kaktushose.jda.commands.definitions.Definition;
+import com.github.kaktushose.jda.commands.definitions.features.internal.Invokable;
+import com.github.kaktushose.jda.commands.definitions.interactions.command.CommandDefinition;
+import com.github.kaktushose.jda.commands.definitions.interactions.command.ContextCommandDefinition;
+import com.github.kaktushose.jda.commands.definitions.interactions.command.SlashCommandDefinition;
+import com.github.kaktushose.jda.commands.definitions.interactions.component.ButtonDefinition;
+import com.github.kaktushose.jda.commands.definitions.interactions.component.ComponentDefinition;
+import com.github.kaktushose.jda.commands.definitions.interactions.component.menu.EntitySelectMenuDefinition;
+import com.github.kaktushose.jda.commands.definitions.interactions.component.menu.StringSelectMenuDefinition;
+import com.github.kaktushose.jda.commands.dispatching.middleware.impl.PermissionsMiddleware;
+import com.github.kaktushose.jda.commands.dispatching.reply.GlobalReplyConfig;
+import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.NotNull;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.Collection;
+
+/// Common interface for all definitions that represent an interaction.
+///
+/// @see AutoCompleteDefinition
+/// @see ModalDefinition
+/// @see ContextCommandDefinition
+/// @see SlashCommandDefinition
+/// @see ButtonDefinition
+/// @see EntitySelectMenuDefinition
+/// @see StringSelectMenuDefinition
+public sealed interface InteractionDefinition extends Definition, Invokable
+        permits AutoCompleteDefinition, ModalDefinition, CommandDefinition, ComponentDefinition {
+
+    /// The id for this definition. For interaction definition this is the hash code of the full class name and method
+    /// name combined.
+    @NotNull
+    @Override
+    default String definitionId() {
+        return String.valueOf((clazzDescription().clazz().getName() + methodDescription().name()).hashCode());
+    }
+
+    /// Creates a new instance of the [Interaction] class.
+    ///
+    /// @return a new instance of the declaring class of the method this definition is bound to.
+    /// @throws InvocationTargetException if the object creation fails
+    /// @throws InstantiationException    if the object creation fails
+    /// @throws IllegalAccessException    if the object creation fails
+    @ApiStatus.Internal
+    default Object newInstance() throws InvocationTargetException, InstantiationException, IllegalAccessException {
+        return clazzDescription().clazz().getConstructors()[0].newInstance();
+    }
+
+    /// A possibly-empty [Collection] of permissions for this interaction.
+    ///
+    /// @apiNote The [PermissionsMiddleware] will validate the provided permissions.
+    @NotNull
+    Collection<String> permissions();
+
+    /// The [ReplyConfig] that should be used when sending replies.
+    ///
+    /// @implNote This will first attempt to use the [`ReplyConfig`][com.github.kaktushose.jda.commands.annotations.interactions.ReplyConfig]
+    /// annotation of the method and then of the class. If neither is present will fall back to the [GlobalReplyConfig].
+    @NotNull
+    default ReplyConfig replyConfig() {
+        var global = clazzDescription().annotation(com.github.kaktushose.jda.commands.annotations.interactions.ReplyConfig.class);
+        var local = methodDescription().annotation(com.github.kaktushose.jda.commands.annotations.interactions.ReplyConfig.class);
+
+        if (global.isEmpty() && local.isEmpty()) {
+            return new ReplyConfig();
+        }
+
+        return local.map(ReplyConfig::new).orElseGet(() -> new ReplyConfig(global.get()));
+
+    }
+
+    /// Stores the configuration values for sending replies. This acts as a representation of
+    /// [`ReplyConfig`][com.github.kaktushose.jda.commands.annotations.interactions.ReplyConfig].
+    ///
+    /// @see com.github.kaktushose.jda.commands.annotations.interactions.ReplyConfig ReplyConfig
+    record ReplyConfig(boolean ephemeral, boolean keepComponents, boolean editReply) {
+
+        /// Constructs a new ReplyConfig using the default values specified by [GlobalReplyConfig].
+        public ReplyConfig() {
+            this(GlobalReplyConfig.ephemeral, GlobalReplyConfig.keepComponents, GlobalReplyConfig.editReply);
+        }
+
+        /// Constructs a new ReplyConfig.
+        ///
+        /// @param replyConfig the [`ReplyConfig`][com.github.kaktushose.jda.commands.annotations.interactions.ReplyConfig] to represent
+        public ReplyConfig(@NotNull com.github.kaktushose.jda.commands.annotations.interactions.ReplyConfig replyConfig) {
+            this(replyConfig.ephemeral(), replyConfig.keepComponents(), replyConfig.editReply());
+        }
+    }
+}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/InteractionRegistry.java b/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/InteractionRegistry.java
new file mode 100644
index 000000000..67bce5390
--- /dev/null
+++ b/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/InteractionRegistry.java
@@ -0,0 +1,203 @@
+package com.github.kaktushose.jda.commands.definitions.interactions;
+
+import com.github.kaktushose.jda.commands.annotations.Inject;
+import com.github.kaktushose.jda.commands.annotations.interactions.*;
+import com.github.kaktushose.jda.commands.definitions.Definition;
+import com.github.kaktushose.jda.commands.definitions.description.ClassDescription;
+import com.github.kaktushose.jda.commands.definitions.description.Descriptor;
+import com.github.kaktushose.jda.commands.definitions.description.MethodDescription;
+import com.github.kaktushose.jda.commands.definitions.interactions.command.ContextCommandDefinition;
+import com.github.kaktushose.jda.commands.definitions.interactions.command.SlashCommandDefinition;
+import com.github.kaktushose.jda.commands.definitions.interactions.component.ButtonDefinition;
+import com.github.kaktushose.jda.commands.definitions.interactions.component.menu.EntitySelectMenuDefinition;
+import com.github.kaktushose.jda.commands.definitions.interactions.component.menu.StringSelectMenuDefinition;
+import com.github.kaktushose.jda.commands.dependency.DependencyInjector;
+import com.github.kaktushose.jda.commands.dispatching.validation.ValidatorRegistry;
+import net.dv8tion.jda.api.interactions.commands.localization.LocalizationFunction;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.Optional;
+import java.util.*;
+import java.util.function.Predicate;
+
+import static com.github.kaktushose.jda.commands.definitions.interactions.command.SlashCommandDefinition.CooldownDefinition;
+
+/// Central registry for all [InteractionDefinition]s.
+public record InteractionRegistry(DependencyInjector dependencyInjector,
+                                  ValidatorRegistry validatorRegistry,
+                                  LocalizationFunction localizationFunction,
+                                  Descriptor descriptor,
+                                  Set<Definition> definitions
+) {
+
+    private static final Logger log = LoggerFactory.getLogger(InteractionRegistry.class);
+
+    /// Constructs a new [InteractionRegistry]
+    ///
+    /// @param injector   the [DependencyInjector] to use
+    /// @param registry   the corresponding [ValidatorRegistry]
+    /// @param function   the [LocalizationFunction] to use
+    /// @param descriptor the [Descriptor] to use
+    public InteractionRegistry(DependencyInjector injector, ValidatorRegistry registry, LocalizationFunction function, Descriptor descriptor) {
+        this(injector, registry, function, descriptor, new HashSet<>());
+    }
+
+    /// Scans all given classes and registers the interactions defined in them.
+    ///
+    /// @param classes the [Class]es to build the interactions from
+    public void index(Iterable<Class<?>> classes) {
+        int oldSize = definitions.size();
+
+        int count = 0;
+        for (Class<?> clazz : classes) {
+            log.debug("Found interaction controller {}", clazz.getName());
+            definitions.addAll(indexInteractionClass(descriptor.apply(clazz)));
+            count++;
+        }
+
+        log.debug("Successfully registered {} interaction controller(s) with a total of {} interaction(s)!",
+                count,
+                definitions.size() - oldSize);
+    }
+
+    private Collection<Definition> indexInteractionClass(ClassDescription clazz) {
+        var interaction = clazz.annotation(Interaction.class).orElseThrow();
+
+        var fields = Arrays.stream(clazz.clazz().getDeclaredFields())
+                .filter(field -> field.isAnnotationPresent(Inject.class))
+                .toList();
+        dependencyInjector.registerDependencies(clazz.clazz(), fields);
+
+        final Set<String> permissions = clazz.annotation(Permissions.class).map(value -> Set.of(value.value())).orElseGet(Set::of);
+        // get controller level cooldown and use it if no command level cooldown is present
+        CooldownDefinition cooldown = clazz.annotation(Cooldown.class).map(CooldownDefinition::build).orElse(null);
+
+        var autoCompletes = autoCompleteDefinitions(clazz);
+
+        // index interactions
+        var interactionDefinitions = interactionDefinitions(
+                clazz,
+                validatorRegistry,
+                localizationFunction,
+                interaction,
+                permissions,
+                cooldown,
+                autoCompletes
+        );
+
+        // validate auto completes
+        var commandDefinitions = interactionDefinitions.stream()
+                .filter(SlashCommandDefinition.class::isInstance)
+                .map(SlashCommandDefinition.class::cast)
+                .toList();
+
+        autoCompletes.stream()
+                .map(AutoCompleteDefinition::commands)
+                .flatMap(Collection::stream)
+                .filter(name -> commandDefinitions.stream().noneMatch(command -> command.name().startsWith(name)))
+                .forEach(s -> log.warn("No Command found for auto complete {}", s));
+
+        return interactionDefinitions;
+    }
+
+    private Collection<AutoCompleteDefinition> autoCompleteDefinitions(ClassDescription clazz) {
+        return clazz.methods().stream()
+                .filter(it -> it.annotation(AutoComplete.class).isPresent())
+                .map(method -> AutoCompleteDefinition.build(clazz, method))
+                .filter(Optional::isPresent)
+                .map(Optional::get)
+                .toList();
+    }
+
+    private Set<Definition> interactionDefinitions(ClassDescription clazz,
+                                                   ValidatorRegistry validatorRegistry,
+                                                   LocalizationFunction localizationFunction,
+                                                   Interaction interaction,
+                                                   Set<String> permissions,
+                                                   CooldownDefinition cooldown,
+                                                   Collection<AutoCompleteDefinition> autocompletes) {
+        Set<Definition> definitions = new HashSet<>(autocompletes);
+        for (MethodDescription method : clazz.methods()) {
+            final MethodBuildContext context = new MethodBuildContext(
+                    validatorRegistry,
+                    localizationFunction,
+                    interaction,
+                    permissions,
+                    cooldown,
+                    clazz,
+                    method,
+                    autocompletes
+            );
+
+            Optional<? extends Definition> definition = Optional.empty();
+            // index commands
+            if (method.annotation(SlashCommand.class).isPresent()) {
+                definition = SlashCommandDefinition.build(context);
+            }
+            if (method.annotation(ContextCommand.class).isPresent()) {
+                definition = ContextCommandDefinition.build(context);
+            }
+
+            // index components
+            if (method.annotation(Button.class).isPresent()) {
+                definition = ButtonDefinition.build(context);
+            }
+            if (method.annotation(EntitySelectMenu.class).isPresent()) {
+                definition = EntitySelectMenuDefinition.build(context);
+            }
+            if (method.annotation(StringSelectMenu.class).isPresent()) {
+                definition = StringSelectMenuDefinition.build(context);
+            }
+
+            //index modals
+            if (method.annotation(Modal.class).isPresent()) {
+                definition = ModalDefinition.build(context);
+            }
+
+            definition.ifPresent(definitions::add);
+        }
+        return definitions;
+    }
+
+    /// Attempts to find a [Definition] of type [T] based on the given [Predicate].
+    ///
+    /// @param type          the type of the [Definition] to find
+    /// @param internalError `true` if the [Definition] must be found and not finding it
+    ///                      indicates a framework bug
+    /// @param predicate     the [Predicate] used to find the [Definition]
+    /// @param <T>           a subtype of [Definition]
+    /// @return [T]
+    /// @throws IllegalStateException    if no [Definition] was found, although this mandatory should have been the case.
+    ///                                  This is a rare occasion and can be considered a framework bug
+    /// @throws IllegalArgumentException if no [Definition] was found, because the [Predicate] didn't include any elements
+    public <T extends Definition> T find(Class<T> type, boolean internalError, Predicate<T> predicate) {
+        return definitions.stream()
+                .filter(type::isInstance)
+                .map(type::cast)
+                .filter(predicate)
+                .findFirst()
+                .orElseThrow(() -> internalError
+                        ? new IllegalStateException("No interaction found! Please report this error the the devs of jda-commands.")
+                        : new IllegalArgumentException("No interaction found! Please check that the referenced interaction method exists.")
+                );
+    }
+
+    /// Attempts to find all [Definition]s of type [T] based on the given [Predicate].
+    ///
+    /// @param type          the type of the [Definition] to find
+    ///                      indicates a framework bug
+    /// @param predicate     the [Predicate] used to find the [Definition]s
+    /// @param <T>           a subtype of [Definition]
+    /// @return a possibly-empty [Collection] of all [Definition]s that match the given [Predicate]
+    /// @throws IllegalStateException    if no [Definition] was found, although this mandatory should have been the case.
+    ///                                  This is a rare occasion and can be considered a framework bug
+    /// @throws IllegalArgumentException if no [Definition] was found, because the [Predicate] didn't include any elements
+    public <T extends Definition> Collection<T> find(Class<T> type, Predicate<T> predicate) {
+        return definitions.stream()
+                .filter(type::isInstance)
+                .map(type::cast)
+                .filter(predicate)
+                .toList();
+    }
+}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/MethodBuildContext.java b/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/MethodBuildContext.java
new file mode 100644
index 000000000..5f7c0717f
--- /dev/null
+++ b/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/MethodBuildContext.java
@@ -0,0 +1,27 @@
+package com.github.kaktushose.jda.commands.definitions.interactions;
+
+import com.github.kaktushose.jda.commands.annotations.interactions.Interaction;
+import com.github.kaktushose.jda.commands.definitions.description.ClassDescription;
+import com.github.kaktushose.jda.commands.definitions.description.MethodDescription;
+import com.github.kaktushose.jda.commands.definitions.interactions.command.SlashCommandDefinition.CooldownDefinition;
+import com.github.kaktushose.jda.commands.dispatching.validation.ValidatorRegistry;
+import net.dv8tion.jda.api.interactions.commands.localization.LocalizationFunction;
+import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Collection;
+import java.util.Set;
+
+/// Holds all objects needed to create an [InteractionDefinition].
+@ApiStatus.Internal
+public record MethodBuildContext(
+        @NotNull ValidatorRegistry validatorRegistry,
+        @NotNull LocalizationFunction localizationFunction,
+        Interaction interaction,
+        @NotNull Set<String> permissions,
+        @Nullable CooldownDefinition cooldownDefinition,
+        @NotNull ClassDescription clazz,
+        @NotNull MethodDescription method,
+        @NotNull Collection<AutoCompleteDefinition> autoCompleteDefinitions
+) {}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/ModalDefinition.java b/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/ModalDefinition.java
new file mode 100644
index 000000000..dc95bc45c
--- /dev/null
+++ b/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/ModalDefinition.java
@@ -0,0 +1,168 @@
+package com.github.kaktushose.jda.commands.definitions.interactions;
+
+import com.github.kaktushose.jda.commands.definitions.Definition;
+import com.github.kaktushose.jda.commands.definitions.description.ClassDescription;
+import com.github.kaktushose.jda.commands.definitions.description.MethodDescription;
+import com.github.kaktushose.jda.commands.definitions.description.ParameterDescription;
+import com.github.kaktushose.jda.commands.definitions.features.CustomIdJDAEntity;
+import com.github.kaktushose.jda.commands.definitions.features.JDAEntity;
+import com.github.kaktushose.jda.commands.definitions.interactions.command.ParameterDefinition;
+import com.github.kaktushose.jda.commands.dispatching.events.interactions.ModalEvent;
+import com.github.kaktushose.jda.commands.internal.Helpers;
+import net.dv8tion.jda.api.interactions.components.text.TextInput;
+import net.dv8tion.jda.api.interactions.components.text.TextInputStyle;
+import net.dv8tion.jda.api.interactions.modals.Modal;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.*;
+
+/// Representation of a modal.
+///
+/// @param clazzDescription  the [ClassDescription] of the declaring class of the [#methodDescription()]
+/// @param methodDescription the [MethodDescription] of the method this definition is bound to
+/// @param permissions       a [Collection] of permissions for this modal
+/// @param title             the title of the modal
+/// @param textInputs        the [`TextInputs`][TextInputDefinition] of this modal
+public record ModalDefinition(
+        @NotNull ClassDescription clazzDescription,
+        @NotNull MethodDescription methodDescription,
+        @NotNull Collection<String> permissions,
+        @NotNull String title,
+        @NotNull SequencedCollection<TextInputDefinition> textInputs
+) implements InteractionDefinition, CustomIdJDAEntity<Modal> {
+
+    /// Builds a new [ModalDefinition] from the given [MethodBuildContext].
+    ///
+    /// @return an [Optional] holding the [ModalDefinition]
+    public static Optional<ModalDefinition> build(MethodBuildContext context) {
+        var method = context.method();
+        var modal = method.annotation(com.github.kaktushose.jda.commands.annotations.interactions.Modal.class).orElseThrow();
+
+        // Modals support up to 5 TextInputs
+        if (method.parameters().isEmpty() || method.parameters().size() > 6) {
+            log.error("An error has occurred! Skipping Modal {}.{}:",
+                    method.declaringClass().getName(),
+                    method.name(),
+                    new IllegalArgumentException("Invalid amount of parameters! Modals need between 1 and 5 TextInputs"));
+            return Optional.empty();
+        }
+
+        if (Helpers.isIncorrectParameterType(method, 0, ModalEvent.class)) {
+            return Optional.empty();
+        }
+
+        List<TextInputDefinition> textInputs = new ArrayList<>();
+        for (int i = 1; i < method.parameters().size(); i++) {
+            var parameter = List.copyOf(method.parameters()).get(i);
+            TextInputDefinition.build(parameter).ifPresent(textInputs::add);
+        }
+
+        if (textInputs.isEmpty()) {
+            log.error("An error has occurred! Skipping Modal {}.{}:",
+                    method.declaringClass().getName(),
+                    method.name(),
+                    new IllegalArgumentException("Modals need at least one valid TextInput"));
+            return Optional.empty();
+        }
+
+        List<Class<?>> signature = new ArrayList<>();
+        signature.add(ModalEvent.class);
+        textInputs.forEach(_ -> signature.add(String.class));
+        if (Helpers.checkSignature(method, signature)) {
+            return Optional.empty();
+        }
+
+
+        return Optional.of(new ModalDefinition(context.clazz(), method, Helpers.permissions(context), modal.value(), textInputs));
+    }
+
+    /// Transforms this definition to an [Modal] with the given custom id.
+    ///
+    /// @return the [Modal]
+    /// @see CustomId#independent(String)
+    @NotNull
+    @Override
+    public Modal toJDAEntity(@NotNull CustomId customId) {
+        var modal = Modal.create(customId.id(), title);
+
+        textInputs.forEach(textInput -> modal.addActionRow(textInput.toJDAEntity()));
+
+        return modal.build();
+    }
+
+    @NotNull
+    @Override
+    public String displayName() {
+        return title;
+    }
+
+    /// Representation of a modal text input defined by
+    /// [`TextInput`][com.github.kaktushose.jda.commands.annotations.interactions.TextInput]
+    public record TextInputDefinition(
+            @NotNull String label,
+            @NotNull String placeholder,
+            @NotNull String defaultValue,
+            int minValue,
+            int maxValue,
+            @NotNull TextInputStyle style,
+            boolean required
+    ) implements JDAEntity<TextInput>, Definition {
+
+        /// Builds a new [TextInputDefinition] from the given [ParameterDefinition]
+        ///
+        /// @param parameter the [ParameterDefinition] to build the [TextInputDefinition] from
+        /// @return the new [TextInputDefinition]
+        public static Optional<TextInputDefinition> build(ParameterDescription parameter) {
+            var optional = parameter.annotation(com.github.kaktushose.jda.commands.annotations.interactions.TextInput.class);
+
+            if (optional.isEmpty()) {
+                return Optional.empty();
+            }
+
+            // TODO for now we only allow Strings, maybe add type adapting in the future
+            if (!String.class.isAssignableFrom(parameter.type())) {
+                return Optional.empty();
+            }
+            var textInput = optional.get();
+
+            return Optional.of(new TextInputDefinition(
+                    textInput.label().isEmpty() ? parameter.name() : textInput.label(),
+                    textInput.value(),
+                    textInput.defaultValue(),
+                    textInput.minValue(),
+                    textInput.maxValue(),
+                    textInput.style(),
+                    textInput.required()
+            ));
+        }
+
+        @Override
+        public @NotNull String displayName() {
+            return label;
+        }
+
+        /// Transforms this definition into a [TextInput].
+        ///
+        /// @return the [TextInput]
+        @NotNull
+        @Override
+        public TextInput toJDAEntity() {
+            var textInput = TextInput.create(label, label, style).setRequired(required);
+
+            if (minValue != -1) {
+                textInput.setMinLength(minValue);
+            }
+            if (maxValue != -1) {
+                textInput.setMaxLength(maxValue);
+            }
+            if (!placeholder.isBlank()) {
+                textInput.setPlaceholder(placeholder);
+            }
+            if (!defaultValue.isBlank()) {
+                textInput.setValue(defaultValue);
+            }
+
+            return textInput.build();
+        }
+    }
+}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/CommandDefinition.java b/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/CommandDefinition.java
new file mode 100644
index 000000000..b92a64da9
--- /dev/null
+++ b/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/CommandDefinition.java
@@ -0,0 +1,40 @@
+package com.github.kaktushose.jda.commands.definitions.interactions.command;
+
+import com.github.kaktushose.jda.commands.annotations.interactions.CommandScope;
+import com.github.kaktushose.jda.commands.definitions.features.JDAEntity;
+import com.github.kaktushose.jda.commands.definitions.interactions.InteractionDefinition;
+import net.dv8tion.jda.api.Permission;
+import net.dv8tion.jda.api.interactions.commands.Command;
+import net.dv8tion.jda.api.interactions.commands.build.CommandData;
+import net.dv8tion.jda.api.interactions.commands.localization.LocalizationFunction;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Set;
+
+/// Common interface for command interaction definitions.
+///
+/// @see SlashCommandDefinition
+/// @see ContextCommandDefinition
+public sealed interface CommandDefinition extends InteractionDefinition, JDAEntity<CommandData> permits ContextCommandDefinition, SlashCommandDefinition {
+
+    /// The name of the command.
+    @NotNull String name();
+
+    /// Whether this command can only be executed in guilds.
+    boolean guildOnly();
+
+    /// Whether this command is nsfw.
+    boolean nsfw();
+
+    /// The [Command.Type] of this command.
+    @NotNull Command.Type commandType();
+
+    /// A possibly-empty [Set] of [Permission]s this command will be enabled for.
+    @NotNull Set<Permission> enabledPermissions();
+
+    /// The [CommandScope] of this command.
+    @NotNull CommandScope scope();
+
+    /// The [LocalizationFunction] to use for this command.
+    @NotNull LocalizationFunction localizationFunction();
+}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/ContextCommandDefinition.java b/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/ContextCommandDefinition.java
new file mode 100644
index 000000000..ffb63a009
--- /dev/null
+++ b/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/ContextCommandDefinition.java
@@ -0,0 +1,108 @@
+package com.github.kaktushose.jda.commands.definitions.interactions.command;
+
+import com.github.kaktushose.jda.commands.annotations.interactions.ContextCommand;
+import com.github.kaktushose.jda.commands.definitions.description.ClassDescription;
+import com.github.kaktushose.jda.commands.definitions.description.MethodDescription;
+import com.github.kaktushose.jda.commands.definitions.interactions.MethodBuildContext;
+import com.github.kaktushose.jda.commands.dispatching.events.interactions.CommandEvent;
+import com.github.kaktushose.jda.commands.internal.Helpers;
+import net.dv8tion.jda.api.Permission;
+import net.dv8tion.jda.api.entities.Message;
+import net.dv8tion.jda.api.entities.User;
+import net.dv8tion.jda.api.interactions.commands.Command;
+import net.dv8tion.jda.api.interactions.commands.DefaultMemberPermissions;
+import net.dv8tion.jda.api.interactions.commands.build.CommandData;
+import net.dv8tion.jda.api.interactions.commands.build.Commands;
+import net.dv8tion.jda.api.interactions.commands.localization.LocalizationFunction;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+import com.github.kaktushose.jda.commands.annotations.interactions.CommandScope;
+
+/// Representation of a context command.
+///
+/// @param clazzDescription     the [ClassDescription] of the declaring class of the [#methodDescription()]
+/// @param methodDescription    the [MethodDescription] of the method this definition is bound to
+/// @param permissions          a [Collection] of permissions for this command
+/// @param name                 the name of the command
+/// @param commandType          the [Command.Type] of this command
+/// @param scope                the [CommandScope] of this command
+/// @param guildOnly            whether this command can only be executed in guilds
+/// @param nsfw                 whether this command is nsfw
+/// @param enabledPermissions   a possibly-empty [Set] of [Permission]s this command will be enabled for
+/// @param localizationFunction the [LocalizationFunction] to use for this command
+public record ContextCommandDefinition(
+        @NotNull ClassDescription clazzDescription,
+        @NotNull MethodDescription methodDescription,
+        @NotNull Collection<String> permissions,
+        @NotNull String name,
+        @NotNull Command.Type commandType,
+        @NotNull CommandScope scope,
+        boolean guildOnly,
+        boolean nsfw,
+        @NotNull Set<Permission> enabledPermissions,
+        @NotNull LocalizationFunction localizationFunction
+) implements CommandDefinition {
+
+    /// Builds a new [ContextCommandDefinition] from the given [MethodBuildContext].
+    ///
+    /// @return an [Optional] holding the [ContextCommandDefinition]
+    @NotNull
+    public static Optional<ContextCommandDefinition> build(MethodBuildContext context) {
+        var method = context.method();
+        ContextCommand command = method.annotation(ContextCommand.class).orElseThrow();
+
+        var type = switch (command.type()) {
+            case USER -> User.class;
+            case MESSAGE -> Message.class;
+            default -> null;
+        };
+        if (type == null) {
+            log.error("Invalid command type for context command! Must either be USER or MESSAGE");
+            return Optional.empty();
+        }
+        if (Helpers.checkSignature(method, List.of(CommandEvent.class, type))) {
+            return Optional.empty();
+        }
+
+        Set<Permission> enabledFor = Arrays.stream(command.enabledFor()).collect(Collectors.toSet());
+        if (enabledFor.size() == 1 && enabledFor.contains(Permission.UNKNOWN)) {
+            enabledFor.clear();
+        }
+
+        return Optional.of(new ContextCommandDefinition(
+                context.clazz(),
+                method,
+                Helpers.permissions(context),
+                command.value(),
+                command.type(),
+                command.scope(),
+                command.isGuildOnly(),
+                command.isNSFW(),
+                enabledFor,
+                context.localizationFunction()
+        ));
+    }
+
+    /// Transforms this definition into [CommandData].
+    ///
+    /// @return the [CommandData]
+    @NotNull
+    @Override
+    public CommandData toJDAEntity() {
+        var command = Commands.context(commandType, name);
+        command.setGuildOnly(guildOnly)
+                .setNSFW(nsfw)
+                .setDefaultPermissions(DefaultMemberPermissions.enabledFor(enabledPermissions))
+                .setLocalizationFunction(localizationFunction);
+        return command;
+    }
+
+    @NotNull
+    @Override
+    public String displayName() {
+        return name;
+    }
+}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/reflect/ParameterDefinition.java b/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/ParameterDefinition.java
similarity index 54%
rename from src/main/java/com/github/kaktushose/jda/commands/reflect/ParameterDefinition.java
rename to src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/ParameterDefinition.java
index 1e9eee659..0aa4e7953 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/reflect/ParameterDefinition.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/ParameterDefinition.java
@@ -1,11 +1,13 @@
-package com.github.kaktushose.jda.commands.reflect;
+package com.github.kaktushose.jda.commands.definitions.interactions.command;
 
 import com.github.kaktushose.jda.commands.annotations.constraints.Constraint;
 import com.github.kaktushose.jda.commands.annotations.constraints.Max;
 import com.github.kaktushose.jda.commands.annotations.constraints.Min;
 import com.github.kaktushose.jda.commands.annotations.interactions.Choices;
-import com.github.kaktushose.jda.commands.annotations.interactions.Optional;
 import com.github.kaktushose.jda.commands.annotations.interactions.Param;
+import com.github.kaktushose.jda.commands.definitions.Definition;
+import com.github.kaktushose.jda.commands.definitions.description.ParameterDescription;
+import com.github.kaktushose.jda.commands.definitions.features.JDAEntity;
 import com.github.kaktushose.jda.commands.dispatching.validation.Validator;
 import com.github.kaktushose.jda.commands.dispatching.validation.ValidatorRegistry;
 import net.dv8tion.jda.api.entities.Member;
@@ -16,39 +18,44 @@
 import net.dv8tion.jda.api.entities.channel.middleman.AudioChannel;
 import net.dv8tion.jda.api.entities.channel.middleman.GuildChannel;
 import net.dv8tion.jda.api.entities.channel.middleman.GuildMessageChannel;
-import net.dv8tion.jda.api.interactions.commands.Command.Choice;
+import net.dv8tion.jda.api.interactions.commands.Command;
 import net.dv8tion.jda.api.interactions.commands.OptionType;
 import net.dv8tion.jda.api.interactions.commands.build.OptionData;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
-import java.lang.reflect.Parameter;
 import java.util.*;
 
 import static java.util.Map.entry;
 
-/**
- * Representation of a command parameter.
- *
- * @see Constraint
- * @see Choices
- * @see Param
- * @since 2.0.0
- */
+/// Representation of a slash command parameter.
+///
+/// @param type         the [Class] type of the parameter
+/// @param optional     whether this parameter is optional
+/// @param autoComplete whether this parameter supports autocomplete
+/// @param defaultValue the default value of this parameter or `null`
+/// @param name         the name of the parameter
+/// @param description  the description of the parameter
+/// @param choices      a [SequencedCollection] of possible [Command.Choice]s for this parameter
+/// @param constraints  a [Collection] of [ConstraintDefinition]s of this parameter
 public record ParameterDefinition(
-        Class<?> type,
-        boolean isOptional,
-        String defaultValue,
-        boolean isPrimitive,
-        String name,
-        String description,
-        List<Choice> choices,
-        List<ConstraintDefinition> constraints
-) {
-
-    private static final Map<Class<?>, Class<?>> TYPE_MAPPINGS = Map.ofEntries(
+        @NotNull Class<?> type,
+        boolean optional,
+        boolean autoComplete,
+        @Nullable String defaultValue,
+        @NotNull String name,
+        @NotNull String description,
+        @NotNull SequencedCollection<Command.Choice> choices,
+        @NotNull Collection<ConstraintDefinition> constraints
+) implements Definition, JDAEntity<OptionData> {
+
+    /// A mapping of primitive types and their wrapper classes.
+    @ApiStatus.Internal
+    public static final Map<Class<?>, Class<?>> TYPE_MAPPINGS = Map.ofEntries(
             entry(byte.class, Byte.class),
             entry(short.class, Short.class),
             entry(int.class, Integer.class),
@@ -69,7 +76,6 @@ public record ParameterDefinition(
             entry(Boolean.class, OptionType.BOOLEAN),
             entry(Character.class, OptionType.STRING),
             entry(String.class, OptionType.STRING),
-            entry(String[].class, OptionType.STRING),
             entry(User.class, OptionType.USER),
             entry(Member.class, OptionType.USER),
             entry(GuildChannel.class, OptionType.CHANNEL),
@@ -97,27 +103,22 @@ public record ParameterDefinition(
             ))
     );
 
-    /**
-     * Builds a new ParameterDefinition.
-     *
-     * @param parameter the {@link Parameter} of the command method
-     * @param registry  an instance of the corresponding {@link ValidatorRegistry}
-     * @return a new ParameterDefinition
-     */
+    /// Builds a new [ParameterDefinition].
+    ///
+    /// @param parameter         the [ParameterDescription] to build the [ParameterDefinition] from
+    /// @param autoComplete      whether the [ParameterDescription] should support autocomplete
+    /// @param validatorRegistry the corresponding [ValidatorRegistry]
+    /// @return the [ParameterDefinition]
     @NotNull
-    public static ParameterDefinition build(@NotNull Parameter parameter, @NotNull ValidatorRegistry registry) {
-        if (parameter.isVarArgs()) {
-            throw new IllegalArgumentException("VarArgs is not supported for parameters!");
-        }
-
-        Class<?> parameterType = parameter.getType();
-        parameterType = TYPE_MAPPINGS.getOrDefault(parameterType, parameterType);
-
-        // Optional
-        final boolean isOptional = parameter.isAnnotationPresent(Optional.class);
-        String defaultValue = "";
-        if (isOptional) {
-            defaultValue = parameter.getAnnotation(Optional.class).value();
+    public static ParameterDefinition build(ParameterDescription parameter,
+                                            boolean autoComplete,
+                                            @NotNull ValidatorRegistry validatorRegistry) {
+        final var parameterType = TYPE_MAPPINGS.getOrDefault(parameter.type(), parameter.type());
+
+        var optional = parameter.annotation(com.github.kaktushose.jda.commands.annotations.interactions.Optional.class);
+        var defaultValue = "";
+        if (optional.isPresent()) {
+            defaultValue = optional.get().value();
         }
         if (defaultValue.isEmpty()) {
             defaultValue = null;
@@ -125,90 +126,75 @@ public static ParameterDefinition build(@NotNull Parameter parameter, @NotNull V
 
         // index constraints
         List<ConstraintDefinition> constraints = new ArrayList<>();
-        for (Annotation annotation : parameter.getAnnotations()) {
-            Class<?> annotationType = annotation.annotationType();
-            if (!annotationType.isAnnotationPresent(Constraint.class)) {
-                continue;
-            }
-
-            // annotation object is always different, so we cannot cast it. Thus, we need to get the custom error message via reflection
-            String message = "";
-            try {
-                Method method = annotationType.getDeclaredMethod("message");
-                message = (String) method.invoke(annotation);
-            } catch (NoSuchMethodException | InvocationTargetException | IllegalAccessException ignored) {
-            }
-            if (message.isEmpty()) {
-                message = "Parameter validation failed";
-            }
-
-            java.util.Optional<Validator> optional = registry.get(annotationType, parameterType);
-            if (optional.isPresent()) {
-                constraints.add(new ConstraintDefinition(optional.get(), message, annotation));
-            }
-        }
+        parameter.annotations().stream()
+                .filter(it -> it.annotationType().isAnnotationPresent(Constraint.class))
+                .forEach(it -> {
+                    var validator = validatorRegistry.get(it.annotationType(), parameterType);
+                    validator.ifPresent(value -> constraints.add(ConstraintDefinition.build(value, it)));
+                });
 
         // Param
-        String name = parameter.getName();
+        String name = parameter.name();
         String description = "empty description";
-        if (parameter.isAnnotationPresent(Param.class)) {
-            Param param = parameter.getAnnotation(Param.class);
-            name = param.name().isEmpty() ? name : param.name();
-            description = param.value();
+        var param = parameter.annotation(Param.class);
+        if (param.isPresent()) {
+            name = param.get().name().isEmpty() ? name : param.get().name();
+            description = param.get().value();
         }
         name = name.replaceAll("([a-z])([A-Z]+)", "$1_$2").toLowerCase();
 
-        List<Choice> choices = new ArrayList<>();
+        List<Command.Choice> commandChoices = new ArrayList<>();
         // Options
-        if (parameter.isAnnotationPresent(Choices.class)) {
-            Choices opt = parameter.getAnnotation(Choices.class);
-            for (String option : opt.value()) {
+        var choices = parameter.annotation(Choices.class);
+        if (choices.isPresent()) {
+            for (String option : choices.get().value()) {
                 String[] parsed = option.split(":", 2);
                 if (parsed.length < 1) {
                     continue;
                 }
                 if (parsed.length < 2) {
-                    choices.add(new Choice(parsed[0], parsed[0]));
+                    commandChoices.add(new Command.Choice(parsed[0], parsed[0]));
                     continue;
                 }
-                choices.add(new Choice(parsed[0], parsed[1]));
+                commandChoices.add(new Command.Choice(parsed[0], parsed[1]));
             }
         }
-
-        // this value is only used to determine if a default value must be present (primitives cannot be null)
-        boolean usesPrimitives = TYPE_MAPPINGS.containsKey(parameter.getType());
-
         return new ParameterDefinition(
                 parameterType,
-                isOptional,
+                optional.isPresent(),
+                autoComplete,
                 defaultValue,
-                usesPrimitives,
                 name,
                 description,
-                choices,
+                commandChoices,
                 constraints
         );
     }
 
-    /**
-     * Transforms this parameter definition to a {@link OptionData}.
-     *
-     * @param isAutoComplete whether this {@link OptionData} should support auto complete
-     * @return the transformed {@link OptionData}
-     */
-    public OptionData toOptionData(boolean isAutoComplete) {
+    @NotNull
+    @Override
+    public String displayName() {
+        return name;
+    }
+
+    /// Transforms this definition into [OptionData].
+    ///
+    /// @return the [OptionData]
+    @NotNull
+    @Override
+    public OptionData toJDAEntity() {
         OptionType optionType = OPTION_TYPE_MAPPINGS.getOrDefault(type, OptionType.STRING);
 
         OptionData optionData = new OptionData(
                 optionType,
                 name,
                 description,
-                !isOptional
+                !optional
         );
 
         optionData.addChoices(choices);
         if (optionType.canSupportChoices() && choices.isEmpty()) {
-            optionData.setAutoComplete(isAutoComplete);
+            optionData.setAutoComplete(autoComplete);
         }
 
         constraints.stream().filter(constraint ->
@@ -223,4 +209,36 @@ public OptionData toOptionData(boolean isAutoComplete) {
 
         return optionData;
     }
+
+    /// Representation of a parameter constraint defined by a constraint annotation.
+    ///
+    /// @param validator  the corresponding [Validator]
+    /// @param message    the message to display if the constraint fails
+    /// @param annotation the corresponding annotation object
+    public record ConstraintDefinition(Validator validator, String message, Object annotation) implements Definition {
+
+        /// Builds a new  [ConstraintDefinition].
+        ///
+        /// @param validator  the corresponding [Validator]
+        /// @param annotation the corresponding annotation object
+        public static ConstraintDefinition build(@NotNull Validator validator, @NotNull Annotation annotation) {
+            // annotation object is always different, so we cannot cast it. Thus, we need to get the custom error message via reflection
+            var message = "";
+            try {
+                Method method = annotation.getClass().getDeclaredMethod("message");
+                message = (String) method.invoke(annotation);
+            } catch (NoSuchMethodException | InvocationTargetException | IllegalAccessException _) {
+            }
+            if (message.isEmpty()) {
+                message = "Parameter validation failed";
+            }
+            return new ConstraintDefinition(validator, message, annotation);
+        }
+
+        @NotNull
+        @Override
+        public String displayName() {
+            return validator.getClass().getName();
+        }
+    }
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/SlashCommandDefinition.java b/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/SlashCommandDefinition.java
new file mode 100644
index 000000000..34a911cec
--- /dev/null
+++ b/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/SlashCommandDefinition.java
@@ -0,0 +1,192 @@
+package com.github.kaktushose.jda.commands.definitions.interactions.command;
+
+import com.github.kaktushose.jda.commands.annotations.interactions.CommandScope;
+import com.github.kaktushose.jda.commands.annotations.interactions.Cooldown;
+import com.github.kaktushose.jda.commands.annotations.interactions.SlashCommand;
+import com.github.kaktushose.jda.commands.definitions.Definition;
+import com.github.kaktushose.jda.commands.definitions.description.ClassDescription;
+import com.github.kaktushose.jda.commands.definitions.description.MethodDescription;
+import com.github.kaktushose.jda.commands.definitions.interactions.AutoCompleteDefinition;
+import com.github.kaktushose.jda.commands.definitions.interactions.MethodBuildContext;
+import com.github.kaktushose.jda.commands.dispatching.events.interactions.CommandEvent;
+import com.github.kaktushose.jda.commands.internal.Helpers;
+import net.dv8tion.jda.api.Permission;
+import net.dv8tion.jda.api.interactions.commands.Command;
+import net.dv8tion.jda.api.interactions.commands.DefaultMemberPermissions;
+import net.dv8tion.jda.api.interactions.commands.build.Commands;
+import net.dv8tion.jda.api.interactions.commands.build.SlashCommandData;
+import net.dv8tion.jda.api.interactions.commands.build.SubcommandData;
+import net.dv8tion.jda.api.interactions.commands.localization.LocalizationFunction;
+import net.dv8tion.jda.internal.utils.Checks;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+
+/// Representation of a slash command.
+///
+/// @param clazzDescription     the [ClassDescription] of the declaring class of the [#methodDescription()]
+/// @param methodDescription    the [MethodDescription] of the method this definition is bound to
+/// @param permissions          a [Collection] of permissions for this command
+/// @param name                 the name of the command
+/// @param scope                the [CommandScope] of this command
+/// @param guildOnly            whether this command can only be executed in guilds
+/// @param nsfw                 whether this command is nsfw
+/// @param enabledPermissions   a possibly-empty [Set] of [Permission]s this command will be enabled for
+/// @param localizationFunction the [LocalizationFunction] to use for this command
+/// @param description          the command description
+/// @param commandParameters    a [SequencedCollection] of [ParameterDefinition]s
+/// @param cooldown             the corresponding [CooldownDefinition]
+/// @param isAutoComplete       whether this command supports auto complete
+public record SlashCommandDefinition(
+        @NotNull ClassDescription clazzDescription,
+        @NotNull MethodDescription methodDescription,
+        @NotNull Collection<String> permissions,
+        @NotNull String name,
+        @NotNull CommandScope scope,
+        boolean guildOnly,
+        boolean nsfw,
+        @NotNull Set<Permission> enabledPermissions,
+        @NotNull LocalizationFunction localizationFunction,
+        @NotNull String description,
+        @NotNull SequencedCollection<ParameterDefinition> commandParameters,
+        @NotNull CooldownDefinition cooldown,
+        boolean isAutoComplete
+) implements CommandDefinition {
+
+    /// Builds a new [SlashCommandDefinition] from the given [MethodBuildContext].
+    ///
+    /// @return an [Optional] holding the [SlashCommandDefinition]
+    @NotNull
+    public static Optional<SlashCommandDefinition> build(MethodBuildContext context) {
+        var method = context.method();
+        var interaction = context.interaction();
+        var command = method.annotation(SlashCommand.class).orElseThrow();
+
+        String name = String.join(" ", interaction.value(), command.value())
+                .replaceAll(" +", " ")
+                .trim();
+
+        if (name.isEmpty()) {
+            Checks.notBlank(name, "Command name");
+            return Optional.empty();
+        }
+
+        boolean autoComplete = context.autoCompleteDefinitions().stream()
+                .map(AutoCompleteDefinition::commands)
+                .flatMap(Collection::stream)
+                .anyMatch(name::startsWith);
+
+        // build parameter definitions
+        List<ParameterDefinition> parameters = method.parameters().stream()
+                .filter(it -> !(CommandEvent.class.isAssignableFrom(it.type())))
+                .map(parameter -> ParameterDefinition.build(parameter, autoComplete, context.validatorRegistry()))
+                .toList();
+
+        Set<Permission> enabledFor = Set.of(command.enabledFor());
+        if (enabledFor.size() == 1 && enabledFor.contains(Permission.UNKNOWN)) {
+            enabledFor = Set.of();
+        }
+
+        List<Class<?>> signature = new ArrayList<>();
+        signature.add(CommandEvent.class);
+        parameters.forEach(it -> signature.add(it.type()));
+        if (Helpers.checkSignature(method, signature)) {
+            return Optional.empty();
+        }
+
+        CooldownDefinition cooldownDefinition = CooldownDefinition.build(method.annotation(Cooldown.class).orElse(null));
+        if (cooldownDefinition.delay() == 0 && context.cooldownDefinition() != null) {
+            cooldownDefinition = context.cooldownDefinition();
+        }
+
+        return Optional.of(new SlashCommandDefinition(
+                context.clazz(),
+                method,
+                Helpers.permissions(context),
+                name,
+                command.scope(),
+                command.isGuildOnly(),
+                command.isNSFW(),
+                enabledFor,
+                context.localizationFunction(),
+                command.desc(),
+                parameters,
+                cooldownDefinition,
+                autoComplete
+        ));
+    }
+
+    /// Transforms this definition into [SlashCommandData].
+    ///
+    /// @return the [SlashCommandData]
+    @NotNull
+    @Override
+    public SlashCommandData toJDAEntity() {
+        SlashCommandData command = Commands.slash(
+                name,
+                description.replaceAll("N/A", "no description")
+        );
+        command.setGuildOnly(guildOnly)
+                .setNSFW(nsfw)
+                .setLocalizationFunction(localizationFunction)
+                .setDefaultPermissions(DefaultMemberPermissions.enabledFor(enabledPermissions));
+        commandParameters.forEach(parameter -> {
+            if (CommandEvent.class.isAssignableFrom(parameter.type())) {
+                return;
+            }
+            command.addOptions(parameter.toJDAEntity());
+        });
+        return command;
+    }
+
+    /// Transforms this definition into [SubcommandData].
+    ///
+    /// @return the [SubcommandData]
+    public SubcommandData toSubCommandData(String label) {
+        SubcommandData command = new SubcommandData(
+                label,
+                description.replaceAll("N/A", "no description")
+
+        );
+        commandParameters.forEach(parameter -> {
+            command.addOptions(parameter.toJDAEntity());
+        });
+        return command;
+    }
+
+    @NotNull
+    @Override
+    public String displayName() {
+        return "/%s".formatted(name);
+    }
+
+    @NotNull
+    @Override
+    public Command.Type commandType() {
+        return Command.Type.SLASH;
+    }
+
+    /// Representation of a cooldown definition defined by [Cooldown].
+    ///
+    /// @param delay    the delay of the cooldown
+    /// @param timeUnit the [TimeUnit] of the specified delay
+    public record CooldownDefinition(long delay, TimeUnit timeUnit) implements Definition {
+
+        /// Builds a new [CooldownDefinition] from the given [Cooldown] annotation.
+        @NotNull
+        public static CooldownDefinition build(@Nullable Cooldown cooldown) {
+            if (cooldown == null) {
+                return new CooldownDefinition(0, TimeUnit.MILLISECONDS);
+            }
+            return new CooldownDefinition(cooldown.value(), cooldown.timeUnit());
+        }
+
+        @NotNull
+        @Override
+        public String displayName() {
+            return "Cooldown of %d %s".formatted(delay, timeUnit.name());
+        }
+    }
+}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/package-info.java b/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/package-info.java
new file mode 100644
index 000000000..ccc62de37
--- /dev/null
+++ b/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/package-info.java
@@ -0,0 +1,2 @@
+/// [`Definitions`][com.github.kaktushose.jda.commands.definitions.Definition] that represent a command interaction.
+package com.github.kaktushose.jda.commands.definitions.interactions.command;
diff --git a/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/ButtonDefinition.java b/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/ButtonDefinition.java
new file mode 100644
index 000000000..54bdd943f
--- /dev/null
+++ b/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/ButtonDefinition.java
@@ -0,0 +1,100 @@
+package com.github.kaktushose.jda.commands.definitions.interactions.component;
+
+import com.github.kaktushose.jda.commands.definitions.description.ClassDescription;
+import com.github.kaktushose.jda.commands.definitions.description.MethodDescription;
+import com.github.kaktushose.jda.commands.definitions.interactions.CustomId;
+import com.github.kaktushose.jda.commands.definitions.interactions.MethodBuildContext;
+import com.github.kaktushose.jda.commands.definitions.interactions.component.menu.StringSelectMenuDefinition;
+import com.github.kaktushose.jda.commands.dispatching.events.interactions.ComponentEvent;
+import com.github.kaktushose.jda.commands.internal.Helpers;
+import net.dv8tion.jda.api.entities.emoji.Emoji;
+import net.dv8tion.jda.api.interactions.components.buttons.Button;
+import net.dv8tion.jda.api.interactions.components.buttons.ButtonStyle;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Optional;
+
+/// Representation of a button.
+///
+/// @param clazzDescription  the [ClassDescription] of the declaring class of the [#methodDescription()]
+/// @param methodDescription the [MethodDescription] of the method this definition is bound to
+/// @param permissions       a [Collection] of permissions for this button
+/// @param label             the label of this button
+/// @param emoji             the [Emoji] of this button or `null`
+/// @param link              the link of this button or `null`
+/// @param style             the [ButtonStyle] of this button
+public record ButtonDefinition(
+        @NotNull ClassDescription clazzDescription,
+        @NotNull MethodDescription methodDescription,
+        @NotNull Collection<String> permissions,
+        @NotNull String label,
+        @Nullable Emoji emoji,
+        @Nullable String link,
+        @NotNull ButtonStyle style
+) implements ComponentDefinition<Button> {
+
+    /// Constructs a new [ButtonDefinition] from the given [MethodBuildContext].
+    ///
+    /// @return an [ButtonDefinition] holding the [StringSelectMenuDefinition]
+    public static Optional<ButtonDefinition> build(MethodBuildContext context) {
+        var method = context.method();
+        com.github.kaktushose.jda.commands.annotations.interactions.Button button =
+                method.annotation(com.github.kaktushose.jda.commands.annotations.interactions.Button.class).orElseThrow();
+
+        if (Helpers.checkSignature(method, List.of(ComponentEvent.class))) {
+            return Optional.empty();
+        }
+
+        Emoji emoji;
+        String emojiString = button.emoji();
+        if (emojiString.isEmpty()) {
+            emoji = null;
+        } else {
+            emoji = Emoji.fromFormatted(emojiString);
+        }
+
+        return Optional.of(new ButtonDefinition(
+                context.clazz(),
+                method,
+                Helpers.permissions(context),
+                button.value(),
+                emoji,
+                button.link().isEmpty() ? null : button.link(),
+                button.style()
+        ));
+    }
+
+    /// Transforms this definition to an [Button] with an independent custom id.
+    ///
+    /// @return the [Button]
+    /// @see CustomId#independent(String)
+    @NotNull
+    @Override
+    public Button toJDAEntity() {
+        return toJDAEntity(CustomId.independent(definitionId()));
+    }
+
+    /// Transforms this definition to an [Button] with the given [CustomId].
+    ///
+    /// @param customId the [CustomId] to use
+    /// @return the [Button]
+    @NotNull
+    @Override
+    public Button toJDAEntity(@NotNull CustomId customId) {
+        String idOrUrl = Optional.ofNullable(link).orElse(customId.id());
+        if (emoji == null) {
+            return Button.of(style, idOrUrl, label);
+        } else {
+            return Button.of(style, idOrUrl, label, emoji);
+        }
+    }
+
+    @NotNull
+    @Override
+    public String displayName() {
+        return label.isEmpty() ? definitionId() : label;
+    }
+}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/ComponentDefinition.java b/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/ComponentDefinition.java
new file mode 100644
index 000000000..aee6ad5bb
--- /dev/null
+++ b/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/ComponentDefinition.java
@@ -0,0 +1,27 @@
+package com.github.kaktushose.jda.commands.definitions.interactions.component;
+
+import com.github.kaktushose.jda.commands.definitions.description.ClassDescription;
+import com.github.kaktushose.jda.commands.definitions.description.MethodDescription;
+import com.github.kaktushose.jda.commands.definitions.features.CustomIdJDAEntity;
+import com.github.kaktushose.jda.commands.definitions.features.JDAEntity;
+import com.github.kaktushose.jda.commands.definitions.interactions.InteractionDefinition;
+import com.github.kaktushose.jda.commands.definitions.interactions.component.menu.EntitySelectMenuDefinition;
+import com.github.kaktushose.jda.commands.definitions.interactions.component.menu.SelectMenuDefinition;
+import com.github.kaktushose.jda.commands.definitions.interactions.component.menu.StringSelectMenuDefinition;
+import org.jetbrains.annotations.NotNull;
+
+/// Common interface for component interaction definitions.
+///
+/// @see ButtonDefinition
+/// @see EntitySelectMenuDefinition
+/// @see StringSelectMenuDefinition
+public sealed interface ComponentDefinition<T> extends InteractionDefinition, JDAEntity<T>, CustomIdJDAEntity<T>
+        permits ButtonDefinition, SelectMenuDefinition {
+
+    /// The [ClassDescription] of the declaring class of the [#methodDescription()]
+    @NotNull ClassDescription clazzDescription();
+
+    /// The [MethodDescription] of the method this definition is bound to
+    @NotNull MethodDescription methodDescription();
+
+}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/menu/EntitySelectMenuDefinition.java b/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/menu/EntitySelectMenuDefinition.java
new file mode 100644
index 000000000..24c6d3654
--- /dev/null
+++ b/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/menu/EntitySelectMenuDefinition.java
@@ -0,0 +1,115 @@
+package com.github.kaktushose.jda.commands.definitions.interactions.component.menu;
+
+import com.github.kaktushose.jda.commands.definitions.description.ClassDescription;
+import com.github.kaktushose.jda.commands.definitions.description.MethodDescription;
+import com.github.kaktushose.jda.commands.definitions.interactions.CustomId;
+import com.github.kaktushose.jda.commands.definitions.interactions.MethodBuildContext;
+import com.github.kaktushose.jda.commands.dispatching.events.interactions.ComponentEvent;
+import com.github.kaktushose.jda.commands.internal.Helpers;
+import net.dv8tion.jda.api.entities.Mentions;
+import net.dv8tion.jda.api.entities.channel.ChannelType;
+import net.dv8tion.jda.api.interactions.components.selections.EntitySelectMenu;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.*;
+
+/// Representation of an entity select menu.
+///
+/// @param clazzDescription  the [ClassDescription] of the declaring class of the [#methodDescription()]
+/// @param methodDescription the [MethodDescription] of the method this definition is bound to
+/// @param permissions       a [Collection] of permissions for this menu
+/// @param selectTargets     the [EntitySelectMenu.SelectTarget]s of this menu
+/// @param defaultValues     the [EntitySelectMenu.DefaultValue]s of this menu
+/// @param channelTypes      the [ChannelType]s that should be supported by this menu.
+/// @param placeholder       the placeholder text of this menu
+/// @param minValue          the minimum amount of choices
+/// @param maxValue          the maximum amount of choices
+public record EntitySelectMenuDefinition(
+        @NotNull ClassDescription clazzDescription,
+        @NotNull MethodDescription methodDescription,
+        @NotNull Collection<String> permissions,
+        @NotNull Set<EntitySelectMenu.SelectTarget> selectTargets,
+        @NotNull Set<EntitySelectMenu.DefaultValue> defaultValues,
+        @NotNull Set<ChannelType> channelTypes,
+        @NotNull String placeholder,
+        int minValue,
+        int maxValue
+) implements SelectMenuDefinition<EntitySelectMenu> {
+
+    /// Builds a new [EntitySelectMenuDefinition] from the given [MethodBuildContext].
+    ///
+    /// @return an [Optional] holding the [EntitySelectMenuDefinition]
+    public static Optional<EntitySelectMenuDefinition> build(MethodBuildContext context) {
+        var method = context.method();
+        com.github.kaktushose.jda.commands.annotations.interactions.EntitySelectMenu selectMenu =
+                method.annotation(com.github.kaktushose.jda.commands.annotations.interactions.EntitySelectMenu.class).orElseThrow();
+
+        if (Helpers.checkSignature(method, List.of(ComponentEvent.class, Mentions.class))) {
+            return Optional.empty();
+        }
+
+        Set<EntitySelectMenu.DefaultValue> defaultValueSet = new HashSet<>();
+        for (long id : selectMenu.defaultChannels()) {
+            if (id < 0) continue;
+            defaultValueSet.add(EntitySelectMenu.DefaultValue.channel(id));
+        }
+        for (long id : selectMenu.defaultUsers()) {
+            if (id < 0) continue;
+            defaultValueSet.add(EntitySelectMenu.DefaultValue.user(id));
+        }
+        for (long id : selectMenu.defaultRoles()) {
+            if (id < 0) continue;
+            defaultValueSet.add(EntitySelectMenu.DefaultValue.role(id));
+        }
+
+        return Optional.of(new EntitySelectMenuDefinition(
+                context.clazz(),
+                method,
+                Helpers.permissions(context),
+                Set.of(selectMenu.value()),
+                defaultValueSet,
+                new HashSet<>(Set.of(selectMenu.channelTypes())),
+                selectMenu.placeholder(),
+                selectMenu.minValue(),
+                selectMenu.maxValue()
+        ));
+    }
+
+    /// Transforms this definition to an [EntitySelectMenu] with an independent custom id.
+    ///
+    /// @return the [EntitySelectMenu]
+    /// @see CustomId#independent(String)
+    @NotNull
+    @Override
+    public EntitySelectMenu toJDAEntity() {
+        return toJDAEntity(CustomId.independent(definitionId()));
+    }
+
+    /// Transforms this definition to an [EntitySelectMenu] with the given [CustomId].
+    ///
+    /// @param customId the [CustomId] to use
+    /// @return the [EntitySelectMenu]
+    @NotNull
+    @Override
+    public EntitySelectMenu toJDAEntity(@NotNull CustomId customId) {
+        var menu = EntitySelectMenu.create(customId.id(), selectTargets)
+                .setDefaultValues(defaultValues)
+                .setPlaceholder(placeholder)
+                .setRequiredRange(minValue, maxValue);
+
+        // ChannelType.UNKNOWN is the default value inside the annotation. if this statement is true, we can assume that
+        // no channel type was selected
+        channelTypes.remove(ChannelType.UNKNOWN);
+        if (!channelTypes.isEmpty()) {
+            menu.setChannelTypes(channelTypes);
+        }
+        return menu.build();
+    }
+
+    @NotNull
+    @Override
+    public String displayName() {
+        return "Select Menu: %s".formatted(placeholder);
+    }
+
+}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/menu/SelectMenuDefinition.java b/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/menu/SelectMenuDefinition.java
new file mode 100644
index 000000000..ce7fffbac
--- /dev/null
+++ b/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/menu/SelectMenuDefinition.java
@@ -0,0 +1,24 @@
+package com.github.kaktushose.jda.commands.definitions.interactions.component.menu;
+
+import com.github.kaktushose.jda.commands.definitions.interactions.component.ComponentDefinition;
+import net.dv8tion.jda.api.interactions.components.selections.SelectMenu;
+import org.jetbrains.annotations.NotNull;
+
+/// Common interface for select menu definitions.
+///
+/// @see EntitySelectMenuDefinition
+/// @see StringSelectMenuDefinition
+public sealed interface SelectMenuDefinition<T extends SelectMenu> extends ComponentDefinition<T>
+        permits EntitySelectMenuDefinition, StringSelectMenuDefinition {
+
+    /// the placeholder text of this menu
+    @NotNull
+    String placeholder();
+
+    /// the minimum amount of choices
+    int minValue();
+
+    /// the maximum amount of choices
+    int maxValue();
+
+}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/menu/StringSelectMenuDefinition.java b/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/menu/StringSelectMenuDefinition.java
new file mode 100644
index 000000000..d0a0466f1
--- /dev/null
+++ b/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/menu/StringSelectMenuDefinition.java
@@ -0,0 +1,148 @@
+package com.github.kaktushose.jda.commands.definitions.interactions.component.menu;
+
+import com.github.kaktushose.jda.commands.definitions.Definition;
+import com.github.kaktushose.jda.commands.definitions.description.ClassDescription;
+import com.github.kaktushose.jda.commands.definitions.description.MethodDescription;
+import com.github.kaktushose.jda.commands.definitions.features.JDAEntity;
+import com.github.kaktushose.jda.commands.definitions.interactions.CustomId;
+import com.github.kaktushose.jda.commands.definitions.interactions.MethodBuildContext;
+import com.github.kaktushose.jda.commands.dispatching.events.interactions.ComponentEvent;
+import com.github.kaktushose.jda.commands.internal.Helpers;
+import net.dv8tion.jda.api.entities.emoji.Emoji;
+import net.dv8tion.jda.api.interactions.components.selections.SelectOption;
+import net.dv8tion.jda.api.interactions.components.selections.StringSelectMenu;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+/// Representation of a string select menu.
+///
+/// @param clazzDescription  the [ClassDescription] of the declaring class of the [#methodDescription()]
+/// @param methodDescription the [MethodDescription] of the method this definition is bound to
+/// @param permissions       a [Collection] of permissions for this menu
+/// @param selectOptions     the [SelectOptions][SelectOptionDefinition] of this menu
+/// @param placeholder       the placeholder text of this menu
+/// @param minValue          the minimum amount of choices
+/// @param maxValue          the maximum amount of choices
+public record StringSelectMenuDefinition(
+        @NotNull ClassDescription clazzDescription,
+        @NotNull MethodDescription methodDescription,
+        @NotNull Collection<String> permissions,
+        @NotNull Set<SelectOptionDefinition> selectOptions,
+        @NotNull String placeholder,
+        int minValue,
+        int maxValue
+) implements SelectMenuDefinition<StringSelectMenu> {
+
+    /// Builds a new [StringSelectMenuDefinition] from the given [MethodBuildContext].
+    ///
+    /// @return an [Optional] holding the [StringSelectMenuDefinition]
+    public static Optional<StringSelectMenuDefinition> build(MethodBuildContext context) {
+        var method = context.method();
+        com.github.kaktushose.jda.commands.annotations.interactions.StringSelectMenu selectMenu =
+                method.annotation(com.github.kaktushose.jda.commands.annotations.interactions.StringSelectMenu.class).orElseThrow();
+
+        if (Helpers.checkSignature(method, List.of(ComponentEvent.class, List.class))) {
+            return Optional.empty();
+        }
+
+        Set<SelectOptionDefinition> selectOptions = new HashSet<>();
+        method.annotations().stream()
+                .filter(com.github.kaktushose.jda.commands.annotations.interactions.SelectOption.class::isInstance)
+                .map(com.github.kaktushose.jda.commands.annotations.interactions.SelectOption.class::cast)
+                .forEach(it -> {
+                    selectOptions.add(SelectOptionDefinition.build(it));
+                });
+
+        return Optional.of(new StringSelectMenuDefinition(
+                context.clazz(),
+                method,
+                Helpers.permissions(context),
+                selectOptions,
+                selectMenu.value(),
+                selectMenu.minValue(),
+                selectMenu.maxValue()
+        ));
+    }
+
+    /// Transforms this definition to an [StringSelectMenu] with an independent custom id.
+    ///
+    /// @return the [StringSelectMenu]
+    /// @see CustomId#independent(String)
+    @NotNull
+    @Override
+    public StringSelectMenu toJDAEntity() {
+        return toJDAEntity(CustomId.independent(definitionId()));
+    }
+
+    /// Transforms this definition to an [StringSelectMenu] with the given [CustomId].
+    ///
+    /// @param customId the [CustomId] to use
+    /// @return the [StringSelectMenu]
+    @NotNull
+    @Override
+    public StringSelectMenu toJDAEntity(@NotNull CustomId customId) {
+        return StringSelectMenu.create(customId.id())
+                .setPlaceholder(placeholder)
+                .setRequiredRange(minValue, maxValue)
+                .addOptions(selectOptions.stream().map(SelectOptionDefinition::toJDAEntity).collect(Collectors.toSet()))
+                .setDefaultOptions(selectOptions.stream()
+                        .filter(SelectOptionDefinition::isDefault)
+                        .map(SelectOptionDefinition::toJDAEntity)
+                        .collect(Collectors.toSet())
+                )
+                .build();
+    }
+
+    @NotNull
+    @Override
+    public String displayName() {
+        return "Select Menu: %s".formatted(placeholder);
+    }
+
+    /// Representation of a select option for a string select menu defined by a
+    /// [`SelectOption`][com.github.kaktushose.jda.commands.annotations.interactions.SelectOption].
+    ///
+    /// @param value       the value of the select option
+    /// @param label       the label of the select option
+    /// @param description the description of the select option
+    /// @param emoji       the [Emoji] of the select option or `null`
+    /// @param isDefault   whether the select option is a default value
+    public record SelectOptionDefinition(@NotNull String value,
+                                         @NotNull String label,
+                                         @Nullable String description,
+                                         @Nullable Emoji emoji,
+                                         boolean isDefault
+    ) implements JDAEntity<SelectOption>, Definition {
+
+        /// Constructs a new [SelectOptionDefinition] from the given
+        /// [`SelectOption`][com.github.kaktushose.jda.commands.annotations.interactions.SelectOption].
+        public static SelectOptionDefinition build(com.github.kaktushose.jda.commands.annotations.interactions.SelectOption option) {
+            Emoji emoji;
+            String emojiString = option.emoji();
+            if (emojiString.isEmpty()) {
+                emoji = null;
+            } else {
+                emoji = Emoji.fromFormatted(emojiString);
+            }
+            return new SelectOptionDefinition(option.value(), option.label(), option.description(), emoji, option.isDefault());
+        }
+
+        @NotNull
+        @Override
+        public String displayName() {
+            return value;
+        }
+
+        /// Transforms this definition into a [SelectOption].
+        @NotNull
+        @Override
+        public SelectOption toJDAEntity() {
+            return SelectOption.of(label, value)
+                    .withDescription(description)
+                    .withEmoji(emoji);
+        }
+    }
+}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/menu/package-info.java b/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/menu/package-info.java
new file mode 100644
index 000000000..501644021
--- /dev/null
+++ b/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/menu/package-info.java
@@ -0,0 +1,2 @@
+/// [`Definitions`][com.github.kaktushose.jda.commands.definitions.Definition] that represent select menu interactions.
+package com.github.kaktushose.jda.commands.definitions.interactions.component.menu;
diff --git a/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/package-info.java b/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/package-info.java
new file mode 100644
index 000000000..4326873dc
--- /dev/null
+++ b/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/package-info.java
@@ -0,0 +1,2 @@
+/// [`Definitions`][com.github.kaktushose.jda.commands.definitions.Definition] that represent component interactions.
+package com.github.kaktushose.jda.commands.definitions.interactions.component;
diff --git a/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/package-info.java b/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/package-info.java
new file mode 100644
index 000000000..5b16f3f48
--- /dev/null
+++ b/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/package-info.java
@@ -0,0 +1,2 @@
+/// [`Definitions`][com.github.kaktushose.jda.commands.definitions.Definition] that represent any type interaction.
+package com.github.kaktushose.jda.commands.definitions.interactions;
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dependency/DefaultDependencyInjector.java b/src/main/java/com/github/kaktushose/jda/commands/dependency/DefaultDependencyInjector.java
index 135c5446b..f3db50810 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dependency/DefaultDependencyInjector.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dependency/DefaultDependencyInjector.java
@@ -15,22 +15,17 @@
 import java.lang.reflect.Modifier;
 import java.util.*;
 
-/**
- * Default implementation of {@link DependencyInjector}.
- *
- * @see Produces
- * @see com.github.kaktushose.jda.commands.annotations.Inject Inject
- * @since 1.0.0
- */
+/// Default implementation of [DependencyInjector].
+///
+/// @see Produces
+/// @see com.github.kaktushose.jda.commands.annotations.Inject Inject
 public class DefaultDependencyInjector implements DependencyInjector {
 
     private final Map<Class<?>, Object> providedObjects;
     private final Logger log = LoggerFactory.getLogger(DefaultDependencyInjector.class);
     private final Map<Class<?>, List<Field>> dependencies;
 
-    /**
-     * Create a new DependencyInjector.
-     */
+    /// Create a new DependencyInjector.
     public DefaultDependencyInjector() {
         providedObjects = new HashMap<>();
         dependencies = new HashMap<>();
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dependency/DependencyInjector.java b/src/main/java/com/github/kaktushose/jda/commands/dependency/DependencyInjector.java
index 937db317e..c8885d280 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dependency/DependencyInjector.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dependency/DependencyInjector.java
@@ -6,46 +6,35 @@
 import java.lang.reflect.Field;
 import java.util.List;
 
-/**
- * Central registry for dependencies and producing methods. Registered dependencies will be injected with the
- * corresponding values if present, else null.
- *
- * @see Produces
- * @see com.github.kaktushose.jda.commands.annotations.Inject Inject
- * @since 1.0.0
- */
+/// Central registry for dependencies and producing methods. Registered dependencies will be injected with the
+/// corresponding values if present, else null.
+///
+/// @see Produces
+/// @see com.github.kaktushose.jda.commands.annotations.Inject Inject
 public interface DependencyInjector {
 
-    /**
-     * Scans the whole classpath for methods annotated with {@link Produces}. If found, creates a new instance of
-     * the declaring class and will call the method to retrieve the object and register it as a dependency. If the method
-     * is declared as static, no instance will be created. Use {@link #registerProvider(Object)} if no new instance of
-     * the declaring class should be created.
-     *
-     * @param packages package(s) to exclusively scan
-     * @param clazz    a class of the classpath to scan
-     */
+    /// Scans the whole classpath for methods annotated with [Produces]. If found, creates a new instance of
+    /// the declaring class and will call the method to retrieve the object and register it as a dependency. If the method
+    /// is declared as static, no instance will be created. Use [#registerProvider(Object)] if no new instance of
+    /// the declaring class should be created.
+    ///
+    /// @param packages package(s) to exclusively scan
+    /// @param clazz    a class of the classpath to scan
     void index(@NotNull Class<?> clazz, @NotNull String... packages);
 
-    /**
-     * Takes an instance of a class and scans it for methods annotated with {@link Produces}. If found, will call
-     * the method to retrieve the object and register it as a dependency.
-     *
-     * @param provider instance of the class to scan
-     */
+    /// Takes an instance of a class and scans it for methods annotated with [Produces]. If found, will call
+    /// the method to retrieve the object and register it as a dependency.
+    ///
+    /// @param provider instance of the class to scan
     void registerProvider(@NotNull Object provider);
 
-    /**
-     * Registers fields inside a class as dependencies.
-     *
-     * @param clazz  the declaring class
-     * @param fields the dependencies to register
-     */
+    /// Registers fields inside a class as dependencies.
+    ///
+    /// @param clazz  the declaring class
+    /// @param fields the dependencies to register
     void registerDependencies(@NotNull Class<?> clazz, @NotNull List<Field> fields);
 
-    /**
-     * Injects all registered dependencies with the corresponding value. If no value is present {@code null} gets injected.
-     */
+    /// Injects all registered dependencies with the corresponding value. If no value is present `null` gets injected.
     void inject(Object instance);
 }
 
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dependency/package-info.java b/src/main/java/com/github/kaktushose/jda/commands/dependency/package-info.java
index cf6192e8b..26a1346a5 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dependency/package-info.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dependency/package-info.java
@@ -1,4 +1,2 @@
-/**
- * The Dependency Injection feature of jda-commands.
- */
+/// The Dependency Injection feature of jda-commands.
 package com.github.kaktushose.jda.commands.dependency;
diff --git a/src/main/java/com/github/kaktushose/jda/commands/reflect/ImplementationRegistry.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/ImplementationRegistry.java
similarity index 83%
rename from src/main/java/com/github/kaktushose/jda/commands/reflect/ImplementationRegistry.java
rename to src/main/java/com/github/kaktushose/jda/commands/dispatching/ImplementationRegistry.java
index ff3f4eaa9..b929b6096 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/reflect/ImplementationRegistry.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/ImplementationRegistry.java
@@ -1,4 +1,4 @@
-package com.github.kaktushose.jda.commands.reflect;
+package com.github.kaktushose.jda.commands.dispatching;
 
 import com.github.kaktushose.jda.commands.annotations.Implementation;
 import com.github.kaktushose.jda.commands.annotations.Inject;
@@ -17,6 +17,7 @@
 import com.github.kaktushose.jda.commands.permissions.PermissionsProvider;
 import com.github.kaktushose.jda.commands.scope.DefaultGuildScopeProvider;
 import com.github.kaktushose.jda.commands.scope.GuildScopeProvider;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.reflections.Reflections;
 import org.reflections.scanners.Scanners;
@@ -32,21 +33,18 @@
 import java.lang.reflect.ParameterizedType;
 import java.util.*;
 
-/**
- * Central registry for all custom user implementations. This class will look for custom implementations that
- * override the default implementation of this framework. Supports the following interfaces:
- * <ul>
- *     <li>{@link PermissionsProvider}</li>
- *     <li>{@link ErrorMessageFactory}</li>
- *     <li>{@link GuildScopeProvider}</li>
- *     <li>{@link TypeAdapter}</li>
- *     <li>{@link Middleware}</li>
- *     <li>{@link Validator}</li>
- * </ul>
- *
- * @see Implementation
- * @since 2.0.0
- */
+/// Central registry for all custom user implementations. This class will look for custom implementations that
+/// override the default implementation of this framework. Supports the following interfaces:
+///
+///   - [PermissionsProvider]
+///   - [ErrorMessageFactory]
+///   - [GuildScopeProvider]
+///   - [TypeAdapter]
+///   - [Middleware]
+///   - [Validator]
+///
+/// @see Implementation
+@ApiStatus.Internal
 public class ImplementationRegistry {
 
     private static final Logger log = LoggerFactory.getLogger(ImplementationRegistry.class);
@@ -59,14 +57,12 @@ public class ImplementationRegistry {
     private ErrorMessageFactory errorMessageFactory;
     private GuildScopeProvider guildScopeProvider;
 
-    /**
-     * Constructs a new ImplementationRegistry.
-     *
-     * @param dependencyInjector  the corresponding {@link DependencyInjector}
-     * @param middlewareRegistry  the corresponding {@link MiddlewareRegistry}
-     * @param typeAdapterRegistry the corresponding {@link TypeAdapterRegistry}
-     * @param validatorRegistry   the corresponding {@link ValidatorRegistry}
-     */
+    /// Constructs a new ImplementationRegistry.
+    ///
+    /// @param dependencyInjector  the corresponding [DependencyInjector]
+    /// @param middlewareRegistry  the corresponding [MiddlewareRegistry]
+    /// @param typeAdapterRegistry the corresponding [TypeAdapterRegistry]
+    /// @param validatorRegistry   the corresponding [ValidatorRegistry]
     public ImplementationRegistry(DependencyInjector dependencyInjector,
                                   MiddlewareRegistry middlewareRegistry,
                                   TypeAdapterRegistry typeAdapterRegistry,
@@ -81,12 +77,10 @@ public ImplementationRegistry(DependencyInjector dependencyInjector,
         this.validatorRegistry = validatorRegistry;
     }
 
-    /**
-     * Scans the whole classpath for custom implementations.
-     *
-     * @param packages package(s) to exclusively scan
-     * @param clazz    a class of the classpath to scan
-     */
+    /// Scans the whole classpath for custom implementations.
+    ///
+    /// @param packages package(s) to exclusively scan
+    /// @param clazz    a class of the classpath to scan
     public void index(@NotNull Class<?> clazz, @NotNull String... packages) {
         log.debug("Indexing custom implementations...");
 
@@ -110,57 +104,45 @@ public void index(@NotNull Class<?> clazz, @NotNull String... packages) {
         findValidators().forEach(validatorRegistry::register);
     }
 
-    /**
-     * Gets the {@link PermissionsProvider}.
-     *
-     * @return the {@link PermissionsProvider}
-     */
+    /// Gets the [PermissionsProvider].
+    ///
+    /// @return the [PermissionsProvider]
     public PermissionsProvider getPermissionsProvider() {
         return permissionsProvider;
     }
 
-    /**
-     * Sets the {@link PermissionsProvider}.
-     *
-     * @param permissionsProvider the new {@link PermissionsProvider}
-     */
+    /// Sets the [PermissionsProvider].
+    ///
+    /// @param permissionsProvider the new [PermissionsProvider]
     public void setPermissionsProvider(PermissionsProvider permissionsProvider) {
         this.permissionsProvider = permissionsProvider;
     }
 
-    /**
-     * Gets the {@link ErrorMessageFactory}.
-     *
-     * @return the {@link ErrorMessageFactory}
-     */
+    /// Gets the [ErrorMessageFactory].
+    ///
+    /// @return the [ErrorMessageFactory]
     public ErrorMessageFactory getErrorMessageFactory() {
         return errorMessageFactory;
     }
 
-    /**
-     * Sets the {@link ErrorMessageFactory}
-     *
-     * @param errorMessageFactory the new {@link ErrorMessageFactory}
-     */
+    /// Sets the [ErrorMessageFactory]
+    ///
+    /// @param errorMessageFactory the new [ErrorMessageFactory]
     public void setErrorMessageFactory(ErrorMessageFactory errorMessageFactory) {
         this.errorMessageFactory = errorMessageFactory;
     }
 
-    /**
-     * Gets the {@link GuildScopeProvider}.
-     *
-     * @return the {@link GuildScopeProvider}
-     */
+    /// Gets the [GuildScopeProvider].
+    ///
+    /// @return the [GuildScopeProvider]
     public GuildScopeProvider getGuildScopeProvider() {
         return guildScopeProvider;
     }
 
 
-    /**
-     * Sets the {@link GuildScopeProvider}
-     *
-     * @param guildScopeProvider the new {@link GuildScopeProvider}
-     */
+    /// Sets the [GuildScopeProvider]
+    ///
+    /// @param guildScopeProvider the new [GuildScopeProvider]
     public void setGuildScopeProvider(GuildScopeProvider guildScopeProvider) {
         this.guildScopeProvider = guildScopeProvider;
     }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/internal/JDAEventListener.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/JDAEventListener.java
similarity index 86%
rename from src/main/java/com/github/kaktushose/jda/commands/dispatching/internal/JDAEventListener.java
rename to src/main/java/com/github/kaktushose/jda/commands/dispatching/JDAEventListener.java
index 33c62f51b..eb8619485 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/internal/JDAEventListener.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/JDAEventListener.java
@@ -1,7 +1,7 @@
-package com.github.kaktushose.jda.commands.dispatching.internal;
+package com.github.kaktushose.jda.commands.dispatching;
 
+import com.github.kaktushose.jda.commands.definitions.interactions.CustomId;
 import com.github.kaktushose.jda.commands.dispatching.handling.DispatchingContext;
-import com.github.kaktushose.jda.commands.reflect.interactions.CustomId;
 import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent;
 import net.dv8tion.jda.api.events.interaction.ModalInteractionEvent;
 import net.dv8tion.jda.api.events.interaction.command.CommandAutoCompleteInteractionEvent;
@@ -39,13 +39,13 @@ public void onGenericInteractionCreate(@NotNull GenericInteractionCreateEvent jd
                     runtimes.compute(UUID.randomUUID().toString(), (id, _) -> Runtime.startNew(id, context));
 
             // always fetch runtime (bound to runtime)
-            case GenericComponentInteractionCreateEvent event when CustomId.isBound(event.getComponentId()) ->
-                    runtimes.get(CustomId.runtimeId(event.getComponentId()));
-            case ModalInteractionEvent event when CustomId.isBound(event.getModalId()) ->
-                    runtimes.get(CustomId.runtimeId(event.getModalId()));
+            case GenericComponentInteractionCreateEvent event when CustomId.fromEvent(event).isBound() ->
+                    runtimes.get(CustomId.fromEvent(event).runtimeId());
+            case ModalInteractionEvent event when CustomId.fromEvent(event).isBound() ->
+                    runtimes.get(CustomId.fromEvent(event).runtimeId());
 
             // independent components always get their own runtime
-            case GenericComponentInteractionCreateEvent event when CustomId.isIndependent(event.getComponentId()) ->
+            case GenericComponentInteractionCreateEvent event when CustomId.fromEvent(event).isIndependent() ->
                     runtimes.compute(UUID.randomUUID().toString(), (id, _) -> Runtime.startNew(id, context));
             default -> null;
         };
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/internal/Runtime.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/Runtime.java
similarity index 94%
rename from src/main/java/com/github/kaktushose/jda/commands/dispatching/internal/Runtime.java
rename to src/main/java/com/github/kaktushose/jda/commands/dispatching/Runtime.java
index 12082da78..88dc6e966 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/internal/Runtime.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/Runtime.java
@@ -1,11 +1,11 @@
-package com.github.kaktushose.jda.commands.dispatching.internal;
+package com.github.kaktushose.jda.commands.dispatching;
 
-import com.github.kaktushose.jda.commands.dispatching.ExpirationStrategy;
+import com.github.kaktushose.jda.commands.definitions.interactions.InteractionDefinition;
 import com.github.kaktushose.jda.commands.dispatching.context.KeyValueStore;
+import com.github.kaktushose.jda.commands.dispatching.expiration.ExpirationStrategy;
 import com.github.kaktushose.jda.commands.dispatching.handling.*;
 import com.github.kaktushose.jda.commands.dispatching.handling.command.ContextCommandHandler;
 import com.github.kaktushose.jda.commands.dispatching.handling.command.SlashCommandHandler;
-import com.github.kaktushose.jda.commands.reflect.interactions.GenericInteractionDefinition;
 import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent;
 import net.dv8tion.jda.api.events.interaction.ModalInteractionEvent;
 import net.dv8tion.jda.api.events.interaction.command.CommandAutoCompleteInteractionEvent;
@@ -120,8 +120,8 @@ public KeyValueStore keyValueStore() {
         return keyValueStore;
     }
 
-    public Object instance(GenericInteractionDefinition definition) {
-        return instances.computeIfAbsent(definition.getMethod().getClass(), _ -> {
+    public Object instance(InteractionDefinition definition) {
+        return instances.computeIfAbsent(definition.methodDescription().declaringClass(), _ -> {
             try {
                 return definition.newInstance();
             } catch (InvocationTargetException | InstantiationException | IllegalAccessException e) {
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/TypeAdapter.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/TypeAdapter.java
index d164331fa..6646d2d39 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/TypeAdapter.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/TypeAdapter.java
@@ -6,23 +6,18 @@
 import java.util.Optional;
 import java.util.function.BiFunction;
 
-/**
- * Generic top level interface for type adapting.
- *
- * @param <T> the type the adapter parses
- * @see com.github.kaktushose.jda.commands.annotations.Implementation Implementation
- * @since 2.0.0
- */
+/// Generic top level interface for type adapting.
+///
+/// @param <T> the type the adapter parses
+/// @see com.github.kaktushose.jda.commands.annotations.Implementation Implementation
 @FunctionalInterface
 public interface TypeAdapter<T> extends BiFunction<String, GenericInteractionCreateEvent, Optional<T>> {
 
-    /**
-     * Attempts to parse a String to the given type.
-     *
-     * @param raw   the String to parse
-     * @param event the {@link GenericInteractionCreateEvent}
-     * @return the parsed type or an empty Optional if the parsing fails
-     */
+    /// Attempts to parse a String to the given type.
+    ///
+    /// @param raw   the String to parse
+    /// @param event the [GenericInteractionCreateEvent]
+    /// @return the parsed type or an empty Optional if the parsing fails
     @NotNull Optional<T> apply(@NotNull String raw, @NotNull GenericInteractionCreateEvent event);
 
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/TypeAdapterRegistry.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/TypeAdapterRegistry.java
index 0289c12f6..9f181c0f8 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/TypeAdapterRegistry.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/TypeAdapterRegistry.java
@@ -8,6 +8,7 @@
 import net.dv8tion.jda.api.entities.channel.middleman.AudioChannel;
 import net.dv8tion.jda.api.entities.channel.middleman.GuildChannel;
 import net.dv8tion.jda.api.entities.channel.middleman.GuildMessageChannel;
+import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
@@ -17,12 +18,9 @@
 import java.util.Map;
 import java.util.Optional;
 
-/**
- * Central registry for all type adapters.
- *
- * @see TypeAdapter
- * @since 2.0.0
- */
+/// Central registry for all type adapters.
+///
+/// @see TypeAdapter
 public class TypeAdapterRegistry {
 
     public static final Map<Class<?>, Object> DEFAULT_MAPPINGS = Map.of(
@@ -38,18 +36,15 @@ public class TypeAdapterRegistry {
     private static final Logger log = LoggerFactory.getLogger(TypeAdapterRegistry.class);
     private final Map<Class<?>, TypeAdapter<?>> parameterAdapters;
 
-    /**
-     * Constructs a new TypeAdapterRegistry. This will register default type adapters for:
-     * <ul>
-     *     <li>all primitive data types</li>
-     *     <li>String</li>
-     *     <li>String Array</li>
-     *     <li>{@link Member}</li>
-     *     <li>{@link User}</li>
-     *     <li>{@link net.dv8tion.jda.api.entities.channel.middleman.MessageChannel MessageChannel} and subtypes</li>
-     *     <li>{@link Role}</li>
-     * </ul>
-     */
+    /// Constructs a new TypeAdapterRegistry. This will register default type adapters for:
+    ///
+    ///   - all primitive data types
+    ///   - [String]
+    ///   - [String] Array
+    ///   - [Member]
+    ///   - [User]
+    ///   - [MessageChannel] and subtypes
+    ///   - [Role]
     public TypeAdapterRegistry() {
         parameterAdapters = new HashMap<>();
 
@@ -79,43 +74,35 @@ public TypeAdapterRegistry() {
         register(Role.class, new RoleAdapter());
     }
 
-    /**
-     * Registers a new type adapter.
-     *
-     * @param type    the type the adapter is for
-     * @param adapter the {@link TypeAdapter}
-     */
+    /// Registers a new type adapter.
+    ///
+    /// @param type    the type the adapter is for
+    /// @param adapter the [TypeAdapter]
     public void register(@NotNull Class<?> type, @NotNull TypeAdapter<?> adapter) {
         parameterAdapters.put(type, adapter);
         log.debug("Registered adapter {} for type {}", adapter.getClass().getName(), type.getName());
     }
 
-    /**
-     * Unregisters a new type adapter.
-     *
-     * @param type the type the adapter is for
-     */
+    /// Unregisters a new type adapter.
+    ///
+    /// @param type the type the adapter is for
     public void unregister(@NotNull Class<?> type) {
         parameterAdapters.remove(type);
         log.debug("Unregistered adapter for type {}", type.getName());
     }
 
-    /**
-     * Checks if a type adapter for the given type exists.
-     *
-     * @param type the type to check
-     * @return {@code true} if a type adapter exists
-     */
+    /// Checks if a type adapter for the given type exists.
+    ///
+    /// @param type the type to check
+    /// @return `true` if a type adapter exists
     public boolean exists(@Nullable Class<?> type) {
         return parameterAdapters.containsKey(type);
     }
 
-    /**
-     * Retrieves a type adapter.
-     *
-     * @param type the type to get the adapter for
-     * @return the type adapter or an empty Optional if none found
-     */
+    /// Retrieves a type adapter.
+    ///
+    /// @param type the type to get the adapter for
+    /// @return the type adapter or an empty Optional if none found
     public Optional<TypeAdapter<?>> get(@Nullable Class<?> type) {
         return Optional.ofNullable(parameterAdapters.get(type));
     }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/AudioChannelAdapter.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/AudioChannelAdapter.java
index 828c83134..f60fba4af 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/AudioChannelAdapter.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/AudioChannelAdapter.java
@@ -1,7 +1,7 @@
 package com.github.kaktushose.jda.commands.dispatching.adapter.impl;
 
-import com.github.kaktushose.jda.commands.internal.Helpers;
 import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapter;
+import com.github.kaktushose.jda.commands.internal.Helpers;
 import net.dv8tion.jda.api.entities.channel.Channel;
 import net.dv8tion.jda.api.entities.channel.middleman.AudioChannel;
 import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent;
@@ -9,20 +9,14 @@
 
 import java.util.Optional;
 
-/**
- * Type adapter for JDAs {@link AudioChannel}.
- *
- * @since 2.3.0
- */
+/// Type adapter for JDAs [AudioChannel].
 public class AudioChannelAdapter implements TypeAdapter<AudioChannel> {
 
-    /**
-     * Attempts to parse a String to a {@link AudioChannel}. Accepts both the channel id and name.
-     *
-     * @param raw   the String to parse
-     * @param event the {@link GenericInteractionCreateEvent}
-     * @return the parsed {@link AudioChannel} or an empty Optional if the parsing fails
-     */
+    /// Attempts to parse a String to a [AudioChannel]. Accepts both the channel id and name.
+    ///
+    /// @param raw   the String to parse
+    /// @param event the [GenericInteractionCreateEvent]
+    /// @return the parsed [AudioChannel] or an empty Optional if the parsing fails
     @NotNull
     @Override
     public Optional<AudioChannel> apply(@NotNull String raw, @NotNull GenericInteractionCreateEvent event) {
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/BooleanAdapter.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/BooleanAdapter.java
index ceed0a002..aede137c8 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/BooleanAdapter.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/BooleanAdapter.java
@@ -6,21 +6,15 @@
 
 import java.util.Optional;
 
-/**
- * Type adapter for boolean values.
- *
- * @since 2.0.0
- */
+/// Type adapter for boolean values.
 public class BooleanAdapter implements TypeAdapter<Boolean> {
 
-    /**
-     * Attempts to parse a String to a Boolean. Accepts both String literals and {@code 0} or {@code 1}.
-     * Parsing is <em>case-insensitive</em>.
-     *
-     * @param raw   the String to parse
-     * @param event the {@link GenericInteractionCreateEvent}
-     * @return the parsed boolean or an empty Optional if the parsing fails
-     */
+    /// Attempts to parse a String to a Boolean. Accepts both String literals and `0` or `1`.
+    /// Parsing is _case-insensitive_.
+    ///
+    /// @param raw   the String to parse
+    /// @param event the [GenericInteractionCreateEvent]
+    /// @return the parsed boolean or an empty Optional if the parsing fails
     @NotNull
     @Override
     public Optional<Boolean> apply(@NotNull String raw, @NotNull GenericInteractionCreateEvent event) {
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/ByteAdapter.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/ByteAdapter.java
index 761e0cb25..65a360e49 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/ByteAdapter.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/ByteAdapter.java
@@ -6,20 +6,14 @@
 
 import java.util.Optional;
 
-/**
- * Type adapter for byte values.
- *
- * @since 2.0.0
- */
+/// Type adapter for byte values.
 public class ByteAdapter implements TypeAdapter<Byte> {
 
-    /**
-     * Attempts to parse a String to a Byte.
-     *
-     * @param raw   the String to parse
-     * @param event the {@link GenericInteractionCreateEvent}
-     * @return the parsed Byte or an empty Optional if the parsing fails
-     */
+    /// Attempts to parse a String to a Byte.
+    ///
+    /// @param raw   the String to parse
+    /// @param event the [GenericInteractionCreateEvent]
+    /// @return the parsed Byte or an empty Optional if the parsing fails
     @NotNull
     @Override
     public Optional<Byte> apply(@NotNull String raw, @NotNull GenericInteractionCreateEvent event) {
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/CharacterAdapter.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/CharacterAdapter.java
index a58a30923..5b6c80186 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/CharacterAdapter.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/CharacterAdapter.java
@@ -6,20 +6,14 @@
 
 import java.util.Optional;
 
-/**
- * Type adapter for character values.
- *
- * @since 2.0.0
- */
+/// Type adapter for character values.
 public class CharacterAdapter implements TypeAdapter<Character> {
 
-    /**
-     * Casts a String to a Char if and only if {@code raw.length == 1}. Else, returns an empty Optional.
-     *
-     * @param raw   the String to parse
-     * @param event the {@link GenericInteractionCreateEvent}
-     * @return the parsed Char or an empty Optional if the parsing fails
-     */
+    /// Casts a String to a Char if and only if `raw.length == 1`. Else, returns an empty Optional.
+    ///
+    /// @param raw   the String to parse
+    /// @param event the [GenericInteractionCreateEvent]
+    /// @return the parsed Char or an empty Optional if the parsing fails
     @NotNull
     @Override
     public Optional<Character> apply(@NotNull String raw, @NotNull GenericInteractionCreateEvent event) {
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/DoubleAdapter.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/DoubleAdapter.java
index 93da24305..38e6c145d 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/DoubleAdapter.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/DoubleAdapter.java
@@ -6,20 +6,14 @@
 
 import java.util.Optional;
 
-/**
- * Type adapter for double values.
- *
- * @since 2.0.0
- */
+/// Type adapter for double values.
 public class DoubleAdapter implements TypeAdapter<Double> {
 
-    /**
-     * Attempts to parse a String to a Double.
-     *
-     * @param raw   the String to parse
-     * @param event the {@link GenericInteractionCreateEvent}
-     * @return the parsed Double or an empty Optional if the parsing fails
-     */
+    /// Attempts to parse a String to a Double.
+    ///
+    /// @param raw   the String to parse
+    /// @param event the [GenericInteractionCreateEvent]
+    /// @return the parsed Double or an empty Optional if the parsing fails
     @NotNull
     @Override
     public Optional<Double> apply(@NotNull String raw, @NotNull GenericInteractionCreateEvent event) {
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/FloatAdapter.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/FloatAdapter.java
index cdf56c273..4b6cea205 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/FloatAdapter.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/FloatAdapter.java
@@ -6,20 +6,14 @@
 
 import java.util.Optional;
 
-/**
- * Type adapter for float values.
- *
- * @since 2.0.0
- */
+/// Type adapter for float values.
 public class FloatAdapter implements TypeAdapter<Float> {
 
-    /**
-     * Attempts to parse a String to a Float.
-     *
-     * @param raw   the String to parse
-     * @param event the {@link GenericInteractionCreateEvent}
-     * @return the parsed Float or an empty Optional if the parsing fails
-     */
+    /// Attempts to parse a String to a Float.
+    ///
+    /// @param raw   the String to parse
+    /// @param event the [GenericInteractionCreateEvent]
+    /// @return the parsed Float or an empty Optional if the parsing fails
     @NotNull
     @Override
     public Optional<Float> apply(@NotNull String raw, @NotNull GenericInteractionCreateEvent event) {
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/GuildChannelAdapter.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/GuildChannelAdapter.java
index 3fa37a155..01271958c 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/GuildChannelAdapter.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/GuildChannelAdapter.java
@@ -1,7 +1,7 @@
 package com.github.kaktushose.jda.commands.dispatching.adapter.impl;
 
-import com.github.kaktushose.jda.commands.internal.Helpers;
 import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapter;
+import com.github.kaktushose.jda.commands.internal.Helpers;
 import net.dv8tion.jda.api.entities.channel.Channel;
 import net.dv8tion.jda.api.entities.channel.middleman.GuildChannel;
 import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent;
@@ -9,20 +9,14 @@
 
 import java.util.Optional;
 
-/**
- * Type adapter for JDAs {@link GuildChannel}.
- *
- * @since 2.3.0
- */
+/// Type adapter for JDAs [GuildChannel].
 public class GuildChannelAdapter implements TypeAdapter<GuildChannel> {
 
-    /**
-     * Attempts to parse a String to a {@link GuildChannel}. Accepts both the channel id and name.
-     *
-     * @param raw   the String to parse
-     * @param event the {@link GenericInteractionCreateEvent}
-     * @return the parsed {@link GuildChannel} or an empty Optional if the parsing fails
-     */
+    /// Attempts to parse a String to a [GuildChannel]. Accepts both the channel id and name.
+    ///
+    /// @param raw   the String to parse
+    /// @param event the [GenericInteractionCreateEvent]
+    /// @return the parsed [GuildChannel] or an empty Optional if the parsing fails
     @NotNull
     @Override
     public Optional<GuildChannel> apply(@NotNull String raw, @NotNull GenericInteractionCreateEvent event) {
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/GuildMessageChannelAdapter.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/GuildMessageChannelAdapter.java
index 93607c0a9..389ddbfce 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/GuildMessageChannelAdapter.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/GuildMessageChannelAdapter.java
@@ -1,7 +1,7 @@
 package com.github.kaktushose.jda.commands.dispatching.adapter.impl;
 
-import com.github.kaktushose.jda.commands.internal.Helpers;
 import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapter;
+import com.github.kaktushose.jda.commands.internal.Helpers;
 import net.dv8tion.jda.api.entities.channel.Channel;
 import net.dv8tion.jda.api.entities.channel.middleman.GuildMessageChannel;
 import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent;
@@ -9,20 +9,14 @@
 
 import java.util.Optional;
 
-/**
- * Type adapter for JDAs {@link GuildMessageChannel}.
- *
- * @since 2.3.0
- */
+/// Type adapter for JDAs [GuildMessageChannel].
 public class GuildMessageChannelAdapter implements TypeAdapter<GuildMessageChannel> {
 
-    /**
-     * Attempts to parse a String to a {@link GuildMessageChannel}. Accepts both the channel id and name.
-     *
-     * @param raw   the String to parse
-     * @param event the {@link GenericInteractionCreateEvent}
-     * @return the parsed {@link GuildMessageChannel} or an empty Optional if the parsing fails
-     */
+    /// Attempts to parse a String to a [GuildMessageChannel]. Accepts both the channel id and name.
+    ///
+    /// @param raw   the String to parse
+    /// @param event the [GenericInteractionCreateEvent]
+    /// @return the parsed [GuildMessageChannel] or an empty Optional if the parsing fails
     @NotNull
     @Override
     public Optional<GuildMessageChannel> apply(@NotNull String raw, @NotNull GenericInteractionCreateEvent event) {
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/IntegerAdapter.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/IntegerAdapter.java
index 8ad95d21c..89e8aa824 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/IntegerAdapter.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/IntegerAdapter.java
@@ -6,20 +6,14 @@
 
 import java.util.Optional;
 
-/**
- * Type adapter for integer values.
- *
- * @since 2.0.0
- */
+/// Type adapter for integer values.
 public class IntegerAdapter implements TypeAdapter<Integer> {
 
-    /**
-     * Attempts to parse a String to an Integer.
-     *
-     * @param raw   the String to parse
-     * @param event the {@link GenericInteractionCreateEvent}
-     * @return the parsed Integer or an empty Optional if the parsing fails
-     */
+    /// Attempts to parse a String to an Integer.
+    ///
+    /// @param raw   the String to parse
+    /// @param event the [GenericInteractionCreateEvent]
+    /// @return the parsed Integer or an empty Optional if the parsing fails
     @NotNull
     @Override
     public Optional<Integer> apply(@NotNull String raw, @NotNull GenericInteractionCreateEvent event) {
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/LongAdapter.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/LongAdapter.java
index 53151a042..3fead02f0 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/LongAdapter.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/LongAdapter.java
@@ -6,20 +6,14 @@
 
 import java.util.Optional;
 
-/**
- * Type adapter for long values.
- *
- * @since 2.0.0
- */
+/// Type adapter for long values.
 public class LongAdapter implements TypeAdapter<Long> {
 
-    /**
-     * Attempts to parse a String to a Long.
-     *
-     * @param raw   the String to parse
-     * @param event the {@link GenericInteractionCreateEvent}
-     * @return the parsed Long or an empty Optional if the parsing fails
-     */
+    /// Attempts to parse a String to a Long.
+    ///
+    /// @param raw   the String to parse
+    /// @param event the [GenericInteractionCreateEvent]
+    /// @return the parsed Long or an empty Optional if the parsing fails
     @NotNull
     @Override
     public Optional<Long> apply(@NotNull String raw, @NotNull GenericInteractionCreateEvent event) {
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/MemberAdapter.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/MemberAdapter.java
index cde583edf..838117ebd 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/MemberAdapter.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/MemberAdapter.java
@@ -1,7 +1,7 @@
 package com.github.kaktushose.jda.commands.dispatching.adapter.impl;
 
-import com.github.kaktushose.jda.commands.internal.Helpers;
 import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapter;
+import com.github.kaktushose.jda.commands.internal.Helpers;
 import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent;
@@ -10,20 +10,14 @@
 
 import java.util.Optional;
 
-/**
- * Type adapter for JDAs {@link Member}.
- *
- * @since 2.0.0
- */
+/// Type adapter for JDAs [Member].
 public class MemberAdapter implements TypeAdapter<Member> {
 
-    /**
-     * Attempts to parse a String to a {@link Member}. Accepts both the member id and name.
-     *
-     * @param raw   the String to parse
-     * @param event the {@link GenericInteractionCreateEvent}
-     * @return the parsed {@link Member} or an empty Optional if the parsing fails
-     */
+    /// Attempts to parse a String to a [Member]. Accepts both the member id and name.
+    ///
+    /// @param raw   the String to parse
+    /// @param event the [GenericInteractionCreateEvent]
+    /// @return the parsed [Member] or an empty Optional if the parsing fails
     @NotNull
     @Override
     public Optional<Member> apply(@NotNull String raw, @NotNull GenericInteractionCreateEvent event) {
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/NewsChannelAdapter.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/NewsChannelAdapter.java
index 7f5bf70d2..f9b68b602 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/NewsChannelAdapter.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/NewsChannelAdapter.java
@@ -1,7 +1,7 @@
 package com.github.kaktushose.jda.commands.dispatching.adapter.impl;
 
-import com.github.kaktushose.jda.commands.internal.Helpers;
 import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapter;
+import com.github.kaktushose.jda.commands.internal.Helpers;
 import net.dv8tion.jda.api.entities.channel.Channel;
 import net.dv8tion.jda.api.entities.channel.concrete.NewsChannel;
 import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent;
@@ -9,20 +9,14 @@
 
 import java.util.Optional;
 
-/**
- * Type adapter for JDAs {@link NewsChannel}.
- *
- * @since 2.3.0
- */
+/// Type adapter for JDAs [NewsChannel].
 public class NewsChannelAdapter implements TypeAdapter<NewsChannel> {
 
-    /**
-     * Attempts to parse a String to a {@link NewsChannel}. Accepts both the channel id and name.
-     *
-     * @param raw   the String to parse
-     * @param event the {@link GenericInteractionCreateEvent}
-     * @return the parsed {@link NewsChannel} or an empty Optional if the parsing fails
-     */
+    /// Attempts to parse a String to a [NewsChannel]. Accepts both the channel id and name.
+    ///
+    /// @param raw   the String to parse
+    /// @param event the [GenericInteractionCreateEvent]
+    /// @return the parsed [NewsChannel] or an empty Optional if the parsing fails
     @NotNull
     @Override
     public Optional<NewsChannel> apply(@NotNull String raw, @NotNull GenericInteractionCreateEvent event) {
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/RoleAdapter.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/RoleAdapter.java
index 2c550bd4c..9d8aff560 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/RoleAdapter.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/RoleAdapter.java
@@ -1,7 +1,7 @@
 package com.github.kaktushose.jda.commands.dispatching.adapter.impl;
 
-import com.github.kaktushose.jda.commands.internal.Helpers;
 import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapter;
+import com.github.kaktushose.jda.commands.internal.Helpers;
 import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.Role;
 import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent;
@@ -9,20 +9,14 @@
 
 import java.util.Optional;
 
-/**
- * Type adapter for JDAs {@link Role}.
- *
- * @since 2.0.0
- */
+/// Type adapter for JDAs [Role].
 public class RoleAdapter implements TypeAdapter<Role> {
 
-    /**
-     * Attempts to parse a String to a {@link Role}. Accepts both the role id and name.
-     *
-     * @param raw   the String to parse
-     * @param event the {@link GenericInteractionCreateEvent}
-     * @return the parsed {@link Role} or an empty Optional if the parsing fails
-     */
+    /// Attempts to parse a String to a [Role]. Accepts both the role id and name.
+    ///
+    /// @param raw   the String to parse
+    /// @param event the [GenericInteractionCreateEvent]
+    /// @return the parsed [Role] or an empty Optional if the parsing fails
     @NotNull
     @Override
     public Optional<Role> apply(@NotNull String raw, @NotNull GenericInteractionCreateEvent event) {
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/ShortAdapter.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/ShortAdapter.java
index dbf9bb271..d5403c8e9 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/ShortAdapter.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/ShortAdapter.java
@@ -6,20 +6,14 @@
 
 import java.util.Optional;
 
-/**
- * Type adapter for short values.
- *
- * @since 2.0.0
- */
+/// Type adapter for short values.
 public class ShortAdapter implements TypeAdapter<Short> {
 
-    /**
-     * Attempts to parse a String to a Short.
-     *
-     * @param raw   the String to parse
-     * @param event the {@link GenericInteractionCreateEvent}
-     * @return the parsed Short or an empty Optional if the parsing fails
-     */
+    /// Attempts to parse a String to a Short.
+    ///
+    /// @param raw   the String to parse
+    /// @param event the [GenericInteractionCreateEvent]
+    /// @return the parsed Short or an empty Optional if the parsing fails
     @NotNull
     @Override
     public Optional<Short> apply(@NotNull String raw, @NotNull GenericInteractionCreateEvent event) {
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/StageChannelAdapter.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/StageChannelAdapter.java
index 8f7dba30a..70675babf 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/StageChannelAdapter.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/StageChannelAdapter.java
@@ -1,7 +1,7 @@
 package com.github.kaktushose.jda.commands.dispatching.adapter.impl;
 
-import com.github.kaktushose.jda.commands.internal.Helpers;
 import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapter;
+import com.github.kaktushose.jda.commands.internal.Helpers;
 import net.dv8tion.jda.api.entities.channel.Channel;
 import net.dv8tion.jda.api.entities.channel.concrete.StageChannel;
 import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent;
@@ -9,20 +9,14 @@
 
 import java.util.Optional;
 
-/**
- * Type adapter for JDAs {@link StageChannel}.
- *
- * @since 2.3.0
- */
+/// Type adapter for JDAs [StageChannel].
 public class StageChannelAdapter implements TypeAdapter<StageChannel> {
 
-    /**
-     * Attempts to parse a String to a {@link StageChannel}. Accepts both the channel id and name.
-     *
-     * @param raw   the String to parse
-     * @param event the {@link GenericInteractionCreateEvent}
-     * @return the parsed {@link StageChannel} or an empty Optional if the parsing fails
-     */
+    /// Attempts to parse a String to a [StageChannel]. Accepts both the channel id and name.
+    ///
+    /// @param raw   the String to parse
+    /// @param event the [GenericInteractionCreateEvent]
+    /// @return the parsed [StageChannel] or an empty Optional if the parsing fails
     @NotNull
     @Override
     public Optional<StageChannel> apply(@NotNull String raw, @NotNull GenericInteractionCreateEvent event) {
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/TextChannelAdapter.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/TextChannelAdapter.java
index 7732b244e..151bdccb8 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/TextChannelAdapter.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/TextChannelAdapter.java
@@ -1,27 +1,21 @@
 package com.github.kaktushose.jda.commands.dispatching.adapter.impl;
 
-import com.github.kaktushose.jda.commands.internal.Helpers;
 import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapter;
+import com.github.kaktushose.jda.commands.internal.Helpers;
 import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
 import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Optional;
 
-/**
- * Type adapter for JDAs {@link TextChannel}.
- *
- * @since 2.0.0
- */
+/// Type adapter for JDAs [TextChannel].
 public class TextChannelAdapter implements TypeAdapter<TextChannel> {
 
-    /**
-     * Attempts to parse a String to a {@link TextChannel}. Accepts both the channel id and name.
-     *
-     * @param raw   the String to parse
-     * @param event the {@link GenericInteractionCreateEvent}
-     * @return the parsed {@link TextChannel} or an empty Optional if the parsing fails
-     */
+    /// Attempts to parse a String to a [TextChannel]. Accepts both the channel id and name.
+    ///
+    /// @param raw   the String to parse
+    /// @param event the [GenericInteractionCreateEvent]
+    /// @return the parsed [TextChannel] or an empty Optional if the parsing fails
     @NotNull
     @Override
     public Optional<TextChannel> apply(@NotNull String raw, @NotNull GenericInteractionCreateEvent event) {
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/ThreadChannelAdapter.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/ThreadChannelAdapter.java
index d0c3fd180..c74c6d81f 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/ThreadChannelAdapter.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/ThreadChannelAdapter.java
@@ -1,7 +1,7 @@
 package com.github.kaktushose.jda.commands.dispatching.adapter.impl;
 
-import com.github.kaktushose.jda.commands.internal.Helpers;
 import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapter;
+import com.github.kaktushose.jda.commands.internal.Helpers;
 import net.dv8tion.jda.api.entities.channel.Channel;
 import net.dv8tion.jda.api.entities.channel.concrete.ThreadChannel;
 import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent;
@@ -9,20 +9,14 @@
 
 import java.util.Optional;
 
-/**
- * Type adapter for JDAs {@link ThreadChannel}.
- *
- * @since 2.3.0
- */
+/// Type adapter for JDAs [ThreadChannel].
 public class ThreadChannelAdapter implements TypeAdapter<ThreadChannel> {
 
-    /**
-     * Attempts to parse a String to a {@link ThreadChannel}. Accepts both the channel id and name.
-     *
-     * @param raw   the String to parse
-     * @param event the {@link GenericInteractionCreateEvent}
-     * @return the parsed {@link ThreadChannel} or an empty Optional if the parsing fails
-     */
+    /// Attempts to parse a String to a [ThreadChannel]. Accepts both the channel id and name.
+    ///
+    /// @param raw   the String to parse
+    /// @param event the [GenericInteractionCreateEvent]
+    /// @return the parsed [ThreadChannel] or an empty Optional if the parsing fails
     @NotNull
     @Override
     public Optional<ThreadChannel> apply(@NotNull String raw, @NotNull GenericInteractionCreateEvent event) {
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/UserAdapter.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/UserAdapter.java
index c812e0505..6e818ba48 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/UserAdapter.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/UserAdapter.java
@@ -1,7 +1,7 @@
 package com.github.kaktushose.jda.commands.dispatching.adapter.impl;
 
-import com.github.kaktushose.jda.commands.internal.Helpers;
 import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapter;
+import com.github.kaktushose.jda.commands.internal.Helpers;
 import net.dv8tion.jda.api.JDA;
 import net.dv8tion.jda.api.entities.User;
 import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent;
@@ -10,20 +10,14 @@
 
 import java.util.Optional;
 
-/**
- * Type adapter for JDAs {@link User}.
- *
- * @since 2.0.0
- */
+/// Type adapter for JDAs [User].
 public class UserAdapter implements TypeAdapter<User> {
 
-    /**
-     * Attempts to parse a String to a {@link User}. Accepts both the user id and name.
-     *
-     * @param raw   the String to parse
-     * @param event the {@link GenericInteractionCreateEvent}
-     * @return the parsed {@link User} or an empty Optional if the parsing fails
-     */
+    /// Attempts to parse a String to a [User]. Accepts both the user id and name.
+    ///
+    /// @param raw   the String to parse
+    /// @param event the [GenericInteractionCreateEvent]
+    /// @return the parsed [User] or an empty Optional if the parsing fails
     @NotNull
     @Override
     public Optional<User> apply(@NotNull String raw, @NotNull GenericInteractionCreateEvent event) {
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/VoiceChannelAdapter.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/VoiceChannelAdapter.java
index 21562b260..c458c83b8 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/VoiceChannelAdapter.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/VoiceChannelAdapter.java
@@ -1,7 +1,7 @@
 package com.github.kaktushose.jda.commands.dispatching.adapter.impl;
 
-import com.github.kaktushose.jda.commands.internal.Helpers;
 import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapter;
+import com.github.kaktushose.jda.commands.internal.Helpers;
 import net.dv8tion.jda.api.entities.channel.Channel;
 import net.dv8tion.jda.api.entities.channel.concrete.VoiceChannel;
 import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent;
@@ -9,20 +9,14 @@
 
 import java.util.Optional;
 
-/**
- * Type adapter for JDAs {@link VoiceChannel}.
- *
- * @since 2.3.0
- */
+/// Type adapter for JDAs [VoiceChannel].
 public class VoiceChannelAdapter implements TypeAdapter<VoiceChannel> {
 
-    /**
-     * Attempts to parse a String to a {@link VoiceChannel}. Accepts both the channel id and name.
-     *
-     * @param raw   the String to parse
-     * @param event the {@link GenericInteractionCreateEvent}
-     * @return the parsed {@link VoiceChannel} or an empty Optional if the parsing fails
-     */
+    /// Attempts to parse a String to a [VoiceChannel]. Accepts both the channel id and name.
+    ///
+    /// @param raw   the String to parse
+    /// @param event the [GenericInteractionCreateEvent]
+    /// @return the parsed [VoiceChannel] or an empty Optional if the parsing fails
     @NotNull
     @Override
     public Optional<VoiceChannel> apply(@NotNull String raw, @NotNull GenericInteractionCreateEvent event) {
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/package-info.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/package-info.java
index 2aca4eac9..ef563cb80 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/package-info.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/package-info.java
@@ -1,4 +1,2 @@
-/**
- * Default implementations for frequently used types.
- */
+/// Default implementations for frequently used types.
 package com.github.kaktushose.jda.commands.dispatching.adapter.impl;
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/package-info.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/package-info.java
index 5580899fc..9f4e380a4 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/package-info.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/package-info.java
@@ -1,4 +1,2 @@
-/**
- * Generic type adapting system.
- */
+/// Generic type adapting system.
 package com.github.kaktushose.jda.commands.dispatching.adapter;
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/context/InvocationContext.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/context/InvocationContext.java
index 95e9cafd8..1fef49ef4 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/context/InvocationContext.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/context/InvocationContext.java
@@ -1,8 +1,8 @@
 package com.github.kaktushose.jda.commands.dispatching.context;
 
+import com.github.kaktushose.jda.commands.definitions.features.internal.Invokable;
+import com.github.kaktushose.jda.commands.definitions.interactions.InteractionDefinition;
 import com.github.kaktushose.jda.commands.dispatching.reply.MessageReply;
-import com.github.kaktushose.jda.commands.reflect.interactions.GenericInteractionDefinition;
-import com.github.kaktushose.jda.commands.reflect.interactions.ReplyConfig;
 import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent;
 import net.dv8tion.jda.api.utils.messages.MessageCreateData;
 
@@ -13,20 +13,20 @@
 /// @param <T>           The used type of [GenericInteractionCreateEvent]
 /// @param event         the underlying jda event
 /// @param keyValueStore the [KeyValueStore] belonging to this interaction over its whole lifetime
-/// @param arguments     the arguments used to call the final user defined method via [GenericInteractionDefinition#invoke(java.lang.Object, com.github.kaktushose.jda.commands.dispatching.context.InvocationContext)]
-/// @param definition    the [GenericInteractionDefinition] defining this interaction (referring to the user defined method)
+/// @param arguments     the arguments used to call the final user defined method via [Invokable#invoke(java.lang.Object, com.github.kaktushose.jda.commands.dispatching.context.InvocationContext)]
+/// @param definition    the [InteractionDefinition] defining this interaction (referring to the user defined method)
 public record InvocationContext<T extends GenericInteractionCreateEvent>(
         T event,
         KeyValueStore keyValueStore,
-        GenericInteractionDefinition definition,
+        InteractionDefinition definition,
         SequencedCollection<Object> arguments
 ) {
     /// Stops further execution of this invocation at the next suitable moment.
     ///
-    /// @implNote This will interrupt the current event thread
     /// @param errorMessage the error message that should be sent to the user as a reply
+    /// @implNote This will interrupt the current event thread
     public void cancel(MessageCreateData errorMessage) {
-        new MessageReply(event, definition, new ReplyConfig()).reply(errorMessage);
+        new MessageReply(event, definition, new InteractionDefinition.ReplyConfig()).reply(errorMessage);
 
         Thread.currentThread().interrupt();
     }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/context/KeyValueStore.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/context/KeyValueStore.java
index cb4377f68..49346920e 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/context/KeyValueStore.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/context/KeyValueStore.java
@@ -6,65 +6,51 @@
 import java.util.Map;
 import java.util.Optional;
 
-/**
- * A simple key-value-store to store variables between events.
- *
- * @since 4.0.0
- */
+/// A simple key-value-store to store variables between events.
 public class KeyValueStore {
 
     private final Map<String, Object> values = new HashMap<>();
 
-    /**
-     * Gets a value.
-     *
-     * @param key   the key
-     * @param clazz the class of the value
-     * @param <T>   the type of the value
-     * @return an {@link Optional} holding the value
-     */
+    /// Gets a value.
+    ///
+    /// @param key   the key
+    /// @param clazz the class of the value
+    /// @param <T>   the type of the value
+    /// @return an [Optional] holding the value
     public <T> Optional<T> get(String key, @NotNull Class<? extends T> clazz) {
         return Optional.ofNullable(values.get(key)).filter(it -> it.getClass().isAssignableFrom(clazz)).map(clazz::cast);
     }
 
-    /**
-     * Associates the specified value with the specified key.
-     *
-     * @param key   the key
-     * @param value the value
-     * @return this instance for fluent interface
-     */
+    /// Associates the specified value with the specified key.
+    ///
+    /// @param key   the key
+    /// @param value the value
+    /// @return this instance for fluent interface
     public KeyValueStore put(String key, Object value) {
         values.put(key, value);
         return this;
     }
 
-    /**
-     * Whether this StateSection has a value mapped to the key.
-     *
-     * @param key the key
-     * @return {@code true} if this StateSection has a value mapped to the key
-     */
+    /// Whether this StateSection has a value mapped to the key.
+    ///
+    /// @param key the key
+    /// @return `true` if this StateSection has a value mapped to the key
     public boolean contains(String key) {
         return values.containsKey(key);
     }
 
-    /**
-     * Removes the value mapping for a key.
-     *
-     * @param key key whose mapping is to be removed
-     * @return this instance for fluent interface
-     */
+    /// Removes the value mapping for a key.
+    ///
+    /// @param key key whose mapping is to be removed
+    /// @return this instance for fluent interface
     public KeyValueStore remove(String key) {
         values.remove(key);
         return this;
     }
 
-    /**
-     * Removes all the value mappings.
-     *
-     * @return this instance for fluent interface
-     */
+    /// Removes all the value mappings.
+    ///
+    /// @return this instance for fluent interface
     public KeyValueStore clear() {
         values.clear();
         return this;
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/Event.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/Event.java
index ac3f2db1e..e080bf434 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/Event.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/Event.java
@@ -1,17 +1,14 @@
 package com.github.kaktushose.jda.commands.dispatching.events;
 
-import com.github.kaktushose.jda.commands.annotations.interactions.EntitySelectMenu;
-import com.github.kaktushose.jda.commands.annotations.interactions.StringSelectMenu;
-import com.github.kaktushose.jda.commands.dispatching.events.interactions.ComponentEvent;
-import com.github.kaktushose.jda.commands.dispatching.events.interactions.ModalEvent;
-import com.github.kaktushose.jda.commands.dispatching.internal.Runtime;
+import com.github.kaktushose.jda.commands.definitions.interactions.InteractionRegistry;
+import com.github.kaktushose.jda.commands.dispatching.Runtime;
 import com.github.kaktushose.jda.commands.dispatching.context.KeyValueStore;
 import com.github.kaktushose.jda.commands.dispatching.events.interactions.AutoCompleteEvent;
 import com.github.kaktushose.jda.commands.dispatching.events.interactions.CommandEvent;
+import com.github.kaktushose.jda.commands.dispatching.events.interactions.ComponentEvent;
+import com.github.kaktushose.jda.commands.dispatching.events.interactions.ModalEvent;
+import com.github.kaktushose.jda.commands.dispatching.expiration.ExpirationStrategy;
 import com.github.kaktushose.jda.commands.dispatching.middleware.Middleware;
-import com.github.kaktushose.jda.commands.reflect.InteractionRegistry;
-import com.github.kaktushose.jda.commands.reflect.interactions.components.ButtonDefinition;
-import com.github.kaktushose.jda.commands.reflect.interactions.components.menus.GenericSelectMenuDefinition;
 import net.dv8tion.jda.api.JDA;
 import net.dv8tion.jda.api.entities.Entitlement;
 import net.dv8tion.jda.api.entities.Guild;
@@ -21,8 +18,6 @@
 import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent;
 import net.dv8tion.jda.api.interactions.DiscordLocale;
 import net.dv8tion.jda.api.interactions.Interaction;
-import net.dv8tion.jda.api.interactions.components.buttons.Button;
-import net.dv8tion.jda.api.interactions.components.selections.SelectMenu;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -40,22 +35,21 @@
 /// @see CommandEvent
 /// @see ComponentEvent
 /// @see ModalEvent
-/// @since 4.0.0
 public abstract sealed class Event<T extends GenericInteractionCreateEvent> implements Interaction
         permits ReplyableEvent, AutoCompleteEvent {
 
     protected final T event;
-    protected final InteractionRegistry interactionRegistry;
+    protected final InteractionRegistry registry;
     private final Runtime runtime;
 
     /// Constructs a new Event.
     ///
-    /// @param event               the subtype [T] of [GenericInteractionCreateEvent]
-    /// @param interactionRegistry the corresponding [InteractionRegistry]
-    /// @param runtime             the [Runtime] this event lives in
-    protected Event(@NotNull T event, @NotNull InteractionRegistry interactionRegistry, @NotNull Runtime runtime) {
+    /// @param event    the subtype [T] of [GenericInteractionCreateEvent]
+    /// @param registry the corresponding [InteractionRegistry]
+    /// @param runtime  the [Runtime] this event lives in
+    protected Event(@NotNull T event, @NotNull InteractionRegistry registry, @NotNull Runtime runtime) {
         this.event = event;
-        this.interactionRegistry = interactionRegistry;
+        this.registry = registry;
         this.runtime = runtime;
     }
 
@@ -67,49 +61,6 @@ public T jdaEvent() {
         return this.event;
     }
 
-    /// Gets a [`Button`][com.github.kaktushose.jda.commands.annotations.interactions.Button] based on the method name
-    /// and transforms it into a JDA [Button].
-    ///
-    /// The button will be linked to the current [`Runtime`]({@docRoot}/index.html#runtime-concept-heading). This may be useful if you want to send a component without
-    /// using the framework.
-    ///
-    /// @param button the name of the button
-    /// @return the JDA [Button]
-    @NotNull
-    public Button getButton(@NotNull String button) {
-        if (!button.matches("[a-zA-Z]+\\.[a-zA-Z]+")) {
-            throw new IllegalArgumentException("Unknown Button");
-        }
-
-        String sanitizedId = button.replaceAll("\\.", "");
-        ButtonDefinition buttonDefinition = interactionRegistry.getButtons().stream()
-                .filter(it -> it.getDefinitionId().equals(sanitizedId))
-                .findFirst().orElseThrow(() -> new IllegalArgumentException("Unknown Button"));
-
-        return buttonDefinition.toButton().withId(buttonDefinition.boundCustomId(runtimeId()));
-    }
-
-    /// Gets a [StringSelectMenu] or [EntitySelectMenu] based on the method name and transforms it into a JDA [SelectMenu].
-    ///
-    /// The select menu will be linked to the current [`Runtime`]({@docRoot}/index.html#runtime-concept-heading). This may be useful if you want to send a component
-    /// without using the framework.
-    ///
-    /// @param menu the name of the select menu
-    /// @return the JDA [SelectMenu]
-    @NotNull
-    public SelectMenu getSelectMenu(@NotNull String menu) {
-        if (!menu.matches("[a-zA-Z]+\\.[a-zA-Z]+")) {
-            throw new IllegalArgumentException("Unknown Select Menu");
-        }
-
-        String sanitizedId = menu.replaceAll("\\.", "");
-        GenericSelectMenuDefinition<?> selectMenuDefinition = interactionRegistry.getSelectMenus().stream()
-                .filter(it -> it.getDefinitionId().equals(sanitizedId))
-                .findFirst().orElseThrow(() -> new IllegalArgumentException("Unknown Select Menu"));
-
-        return selectMenuDefinition.toSelectMenu(runtimeId(), true);
-    }
-
     /// Returns the id of the [`Runtime`]({@docRoot}/index.html#runtime-concept-heading) this event is dispatched in.
     ///
     ///
@@ -123,7 +74,7 @@ public String runtimeId() {
     /// in the freeing of occupied resources for gc.
     ///
     /// This is only needed if the expiration strategy
-    /// [com.github.kaktushose.jda.commands.dispatching.ExpirationStrategy.Explicit] is used.
+    /// [ExpirationStrategy.Explicit] is used.
     public void closeRuntime() {
         runtime.close();
     }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/ModalReplyableEvent.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/ModalReplyableEvent.java
index 670eec8f1..8efd9e0cd 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/ModalReplyableEvent.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/ModalReplyableEvent.java
@@ -1,12 +1,13 @@
 package com.github.kaktushose.jda.commands.dispatching.events;
 
 import com.github.kaktushose.jda.commands.annotations.interactions.Modal;
-import com.github.kaktushose.jda.commands.dispatching.internal.Runtime;
+import com.github.kaktushose.jda.commands.definitions.interactions.CustomId;
+import com.github.kaktushose.jda.commands.definitions.interactions.InteractionDefinition;
+import com.github.kaktushose.jda.commands.definitions.interactions.InteractionRegistry;
+import com.github.kaktushose.jda.commands.definitions.interactions.ModalDefinition;
+import com.github.kaktushose.jda.commands.dispatching.Runtime;
 import com.github.kaktushose.jda.commands.dispatching.events.interactions.CommandEvent;
 import com.github.kaktushose.jda.commands.dispatching.events.interactions.ComponentEvent;
-import com.github.kaktushose.jda.commands.reflect.InteractionRegistry;
-import com.github.kaktushose.jda.commands.reflect.interactions.EphemeralInteractionDefinition;
-import com.github.kaktushose.jda.commands.reflect.interactions.ModalDefinition;
 import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent;
 import net.dv8tion.jda.api.interactions.callbacks.IModalCallback;
 import org.jetbrains.annotations.NotNull;
@@ -19,7 +20,6 @@
 /// @param <T> the type of [GenericInteractionCreateEvent] this event represents
 /// @see CommandEvent
 /// @see ComponentEvent
-/// @since 4.0.0
 public abstract sealed class ModalReplyableEvent<T extends GenericInteractionCreateEvent>
         extends ReplyableEvent<T>
         permits CommandEvent, ComponentEvent {
@@ -28,15 +28,15 @@ public abstract sealed class ModalReplyableEvent<T extends GenericInteractionCre
 
     /// Constructs a new ModalReplyableEvent.
     ///
-    /// @param event               the subtype [T] of [GenericInteractionCreateEvent]
-    /// @param interactionRegistry the corresponding [InteractionRegistry]
-    /// @param runtime             the [Runtime] this event lives in
-    /// @param definition          the [EphemeralInteractionDefinition] this event belongs to
+    /// @param event      the subtype [T] of [GenericInteractionCreateEvent]
+    /// @param registry   the corresponding [InteractionRegistry]
+    /// @param runtime    the [Runtime] this event lives in
+    /// @param definition the [InteractionDefinition] this event belongs to
     protected ModalReplyableEvent(@NotNull T event,
-                                  @NotNull InteractionRegistry interactionRegistry,
+                                  @NotNull InteractionRegistry registry,
                                   @NotNull Runtime runtime,
-                                  @NotNull EphemeralInteractionDefinition definition) {
-        super(event, interactionRegistry, runtime, definition);
+                                  @NotNull InteractionDefinition definition) {
+        super(event, registry, runtime, definition);
     }
 
     /// Acknowledgement of this event with a [Modal]. This will open a popup on the target user's Discord client.
@@ -45,12 +45,12 @@ protected ModalReplyableEvent(@NotNull T event,
     /// @throws IllegalArgumentException if no [Modal] with the given name was found
     public void replyModal(@NotNull String modal) {
         if (event instanceof IModalCallback callback) {
-            var definitionId = String.valueOf((definition.getMethod().getDeclaringClass().getName() + modal).hashCode());
-            var modalDefinition = interactionRegistry.find(ModalDefinition.class, false, it ->
-                    it.getDefinitionId().equals(definitionId)
+            var definitionId = String.valueOf((definition.clazzDescription().name() + modal).hashCode());
+            var modalDefinition = registry.find(ModalDefinition.class, false, it ->
+                    it.definitionId().equals(definitionId)
             );
-            log.debug("Replying to interaction \"{}\" with Modal: \"{}\". [Runtime={}]", definition.getDisplayName(), modalDefinition.getDisplayName(), runtimeId());
-            callback.replyModal(modalDefinition.toModal(runtimeId())).queue();
+            log.debug("Replying to interaction \"{}\" with Modal: \"{}\". [Runtime={}]", definition.displayName(), modalDefinition.displayName(), runtimeId());
+            callback.replyModal(modalDefinition.toJDAEntity(new CustomId(runtimeId(), definitionId))).queue();
         } else {
             throw new IllegalStateException(
                     String.format("Cannot reply to '%s'! Please report this error to the jda-commands devs!", event.getClass().getName())
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/ReplyableEvent.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/ReplyableEvent.java
index 79832ab65..aa7d0a419 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/ReplyableEvent.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/ReplyableEvent.java
@@ -1,19 +1,25 @@
 package com.github.kaktushose.jda.commands.dispatching.events;
 
+import com.github.kaktushose.jda.commands.annotations.interactions.EntitySelectMenu;
+import com.github.kaktushose.jda.commands.annotations.interactions.StringSelectMenu;
+import com.github.kaktushose.jda.commands.definitions.interactions.CustomId;
+import com.github.kaktushose.jda.commands.definitions.interactions.InteractionDefinition;
+import com.github.kaktushose.jda.commands.definitions.interactions.InteractionRegistry;
+import com.github.kaktushose.jda.commands.definitions.interactions.component.ButtonDefinition;
+import com.github.kaktushose.jda.commands.definitions.interactions.component.menu.SelectMenuDefinition;
+import com.github.kaktushose.jda.commands.dispatching.Runtime;
 import com.github.kaktushose.jda.commands.dispatching.events.interactions.CommandEvent;
 import com.github.kaktushose.jda.commands.dispatching.events.interactions.ComponentEvent;
-import com.github.kaktushose.jda.commands.dispatching.internal.Runtime;
 import com.github.kaktushose.jda.commands.dispatching.events.interactions.ModalEvent;
 import com.github.kaktushose.jda.commands.dispatching.reply.ConfigurableReply;
 import com.github.kaktushose.jda.commands.dispatching.reply.MessageReply;
 import com.github.kaktushose.jda.commands.dispatching.reply.Reply;
-import com.github.kaktushose.jda.commands.reflect.InteractionRegistry;
-import com.github.kaktushose.jda.commands.reflect.interactions.EphemeralInteractionDefinition;
-import com.github.kaktushose.jda.commands.reflect.interactions.ReplyConfig;
 import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.entities.Message;
 import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent;
 import net.dv8tion.jda.api.interactions.callbacks.IReplyCallback;
+import net.dv8tion.jda.api.interactions.components.buttons.Button;
+import net.dv8tion.jda.api.interactions.components.selections.SelectMenu;
 import net.dv8tion.jda.api.utils.messages.MessageCreateData;
 import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
@@ -31,29 +37,26 @@
 ///     event.reply("Hello World");
 /// }
 /// ```
-///
-/// @since 4.0.0
 /// @see ModalEvent
 /// @see CommandEvent
 /// @see ComponentEvent
-/// @since 4.0.0
 public sealed abstract class ReplyableEvent<T extends GenericInteractionCreateEvent> extends Event<T> implements Reply
         permits ModalEvent, ModalReplyableEvent {
 
     private static final Logger log = LoggerFactory.getLogger(ReplyableEvent.class);
-    protected final EphemeralInteractionDefinition definition;
-    private final ReplyConfig replyConfig;
+    protected final InteractionDefinition definition;
+    private final InteractionDefinition.ReplyConfig replyConfig;
 
     /// Constructs a new ReplyableEvent.
     ///
     /// @param event               the subtype [T] of [GenericInteractionCreateEvent]
     /// @param interactionRegistry the corresponding [InteractionRegistry]
     /// @param runtime             the [Runtime] this event lives in
-    /// @param definition          the [EphemeralInteractionDefinition] this event belongs to
+    /// @param definition          the [InteractionDefinition] this event belongs to
     protected ReplyableEvent(T event,
                              InteractionRegistry interactionRegistry,
                              Runtime runtime,
-                             EphemeralInteractionDefinition definition) {
+                             InteractionDefinition definition) {
         super(event, interactionRegistry, runtime);
         this.replyConfig = definition.replyConfig();
         this.definition = definition;
@@ -72,6 +75,35 @@ public void removeComponents() {
         }
     }
 
+    /// Gets a [`Button`][com.github.kaktushose.jda.commands.annotations.interactions.Button] based on the method name
+    /// and transforms it into a JDA [Button].
+    ///
+    /// The button will be linked to the current [`Runtime`]({@docRoot}/index.html#runtime-concept-heading).
+    /// This may be useful if you want to send a component without using the framework.
+    ///
+    /// @param button the name of the button
+    /// @return the JDA [Button]
+    @NotNull
+    public Button getButton(@NotNull String button) {
+        var id = String.valueOf(("%s%s".formatted(definition.clazzDescription().name(), button)).hashCode());
+        var definition = registry.find(ButtonDefinition.class, false, it -> it.definitionId().equals(id));
+        return definition.toJDAEntity(new CustomId(runtimeId(), definition.definitionId()));
+    }
+
+    /// Gets a [StringSelectMenu] or [EntitySelectMenu] based on the method name and transforms it into a JDA [SelectMenu].
+    ///
+    /// The select menu will be linked to the current [`Runtime`]({@docRoot}/index.html#runtime-concept-heading). This may be useful if you want to send a component
+    /// without using the framework.
+    ///
+    /// @param menu the name of the select menu
+    /// @return the JDA [SelectMenu]
+    @NotNull
+    public SelectMenu getSelectMenu(@NotNull String menu) {
+        var id = String.valueOf(("%s%s".formatted(definition.clazzDescription().name(), menu)).hashCode());
+        var definition = registry.find(SelectMenuDefinition.class, false, it -> it.definitionId().equals(id));
+        return (SelectMenu) definition.toJDAEntity(new CustomId(runtimeId(), definition.definitionId()));
+    }
+
     /// Entry point for configuring a reply.
     ///
     /// Returns a new [ConfigurableReply] that can be used to append components or override reply settings.
@@ -80,7 +112,7 @@ public void removeComponents() {
     /// @see [ConfigurableReply]
     @NotNull
     public ConfigurableReply with() {
-        return new ConfigurableReply(newReply(), interactionRegistry, runtimeId());
+        return new ConfigurableReply(newReply(), registry, runtimeId());
     }
 
     @NotNull
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/interactions/AutoCompleteEvent.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/interactions/AutoCompleteEvent.java
index 8484a9f37..8c6a03a5f 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/interactions/AutoCompleteEvent.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/interactions/AutoCompleteEvent.java
@@ -1,8 +1,8 @@
 package com.github.kaktushose.jda.commands.dispatching.events.interactions;
 
-import com.github.kaktushose.jda.commands.dispatching.internal.Runtime;
+import com.github.kaktushose.jda.commands.definitions.interactions.InteractionRegistry;
+import com.github.kaktushose.jda.commands.dispatching.Runtime;
 import com.github.kaktushose.jda.commands.dispatching.events.Event;
-import com.github.kaktushose.jda.commands.reflect.InteractionRegistry;
 import net.dv8tion.jda.api.events.interaction.command.CommandAutoCompleteInteractionEvent;
 import net.dv8tion.jda.api.interactions.commands.Command;
 import net.dv8tion.jda.api.interactions.commands.CommandAutoCompleteInteraction;
@@ -15,26 +15,21 @@
 import java.util.Collection;
 import java.util.stream.Collectors;
 
-/**
- * This class is a subclass of {@link Event}.
- * It provides additional features for replying to a {@link CommandAutoCompleteInteractionEvent}.
- *
- * @see Event
- * @since 4.0.0
- */
+/// This class is a subclass of [Event].
+/// It provides additional features for replying to a [CommandAutoCompleteInteractionEvent].
+///
+/// @see Event
 public final class AutoCompleteEvent extends Event<CommandAutoCompleteInteractionEvent> {
 
-    /**
-     * Constructs a new AutoCompleteEvent.
-     *
-     * @param event               the {@link CommandAutoCompleteInteractionEvent} this event holds
-     * @param interactionRegistry the corresponding {@link InteractionRegistry}
-     * @param runtime             the corresponding {@link Runtime}
-     */
+    /// Constructs a new AutoCompleteEvent.
+    ///
+    /// @param event    the [CommandAutoCompleteInteractionEvent] this event holds
+    /// @param registry the corresponding [InteractionRegistry]
+    /// @param runtime  the corresponding [Runtime]
     public AutoCompleteEvent(@NotNull CommandAutoCompleteInteractionEvent event,
-                             @NotNull InteractionRegistry interactionRegistry,
+                             @NotNull InteractionRegistry registry,
                              @NotNull Runtime runtime) {
-        super(event, interactionRegistry, runtime);
+        super(event, registry, runtime);
     }
 
     /**
@@ -238,34 +233,28 @@ public void replyChoiceDoubles(@NotNull Collection<Double> choices) {
         replyChoices(choices.stream().map(it -> new Command.Choice(String.valueOf(it), it)).collect(Collectors.toList()));
     }
 
-    /**
-     * The name of the input field, usually an option name in {@link CommandAutoCompleteInteraction}.
-     *
-     * @return The option name
-     */
+    /// The name of the input field, usually an option name in [CommandAutoCompleteInteraction].
+    ///
+    /// @return The option name
     @NotNull
     public String getName() {
         return event.getFocusedOption().getName();
     }
 
-    /**
-     * The query value that the user is currently typing.
-     *
-     * <p>This is not validated and may not be a valid value for an actual command.
-     * For instance, a user may input invalid numbers for {@link OptionType#NUMBER}.
-     *
-     * @return The current auto-completable query value
-     */
+    /// The query value that the user is currently typing.
+    ///
+    /// This is not validated and may not be a valid value for an actual command.
+    /// For instance, a user may input invalid numbers for [#NUMBER].
+    ///
+    /// @return The current auto-completable query value
     @NotNull
     public String getValue() {
         return event.getFocusedOption().getValue();
     }
 
-    /**
-     * The expected option type for this query.
-     *
-     * @return The option type expected from this auto-complete response
-     */
+    /// The expected option type for this query.
+    ///
+    /// @return The option type expected from this auto-complete response
     @NotNull
     public OptionType getOptionType() {
         return event.getFocusedOption().getType();
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/interactions/CommandEvent.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/interactions/CommandEvent.java
index 9bd940fcc..4ad709e5e 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/interactions/CommandEvent.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/interactions/CommandEvent.java
@@ -1,10 +1,10 @@
 package com.github.kaktushose.jda.commands.dispatching.events.interactions;
 
-import com.github.kaktushose.jda.commands.dispatching.internal.Runtime;
+import com.github.kaktushose.jda.commands.definitions.interactions.InteractionDefinition;
+import com.github.kaktushose.jda.commands.definitions.interactions.InteractionRegistry;
+import com.github.kaktushose.jda.commands.dispatching.Runtime;
 import com.github.kaktushose.jda.commands.dispatching.events.Event;
 import com.github.kaktushose.jda.commands.dispatching.events.ModalReplyableEvent;
-import com.github.kaktushose.jda.commands.reflect.InteractionRegistry;
-import com.github.kaktushose.jda.commands.reflect.interactions.EphemeralInteractionDefinition;
 import net.dv8tion.jda.api.events.interaction.command.GenericCommandInteractionEvent;
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
 import org.jetbrains.annotations.NotNull;
@@ -13,20 +13,19 @@
 ///
 /// @see Event
 /// @see ModalReplyableEvent
-/// @since 4.0.0
 public final class CommandEvent extends ModalReplyableEvent<GenericCommandInteractionEvent> {
 
     /// Constructs a new CommandEvent.
     ///
-    /// @param event               the [GenericCommandInteractionEvent] this event holds
-    /// @param interactionRegistry the corresponding [InteractionRegistry]
-    /// @param runtime             the corresponding [Runtime]
-    /// @param definition          the corresponding [EphemeralInteractionDefinition]
+    /// @param event      the [GenericCommandInteractionEvent] this event holds
+    /// @param registry   the corresponding [InteractionRegistry]
+    /// @param runtime    the corresponding [Runtime]
+    /// @param definition the corresponding [InteractionDefinition]
     public CommandEvent(@NotNull GenericCommandInteractionEvent event,
-                        @NotNull InteractionRegistry interactionRegistry,
+                        @NotNull InteractionRegistry registry,
                         @NotNull Runtime runtime,
-                        @NotNull EphemeralInteractionDefinition definition) {
-        super(event, interactionRegistry, runtime, definition);
+                        @NotNull InteractionDefinition definition) {
+        super(event, registry, runtime, definition);
     }
 
     /// Returns the underlying [GenericCommandInteractionEvent] and casts it to the given type.
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/interactions/ComponentEvent.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/interactions/ComponentEvent.java
index 067744cf4..54a95854e 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/interactions/ComponentEvent.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/interactions/ComponentEvent.java
@@ -1,10 +1,10 @@
 package com.github.kaktushose.jda.commands.dispatching.events.interactions;
 
-import com.github.kaktushose.jda.commands.dispatching.internal.Runtime;
+import com.github.kaktushose.jda.commands.definitions.interactions.InteractionDefinition;
+import com.github.kaktushose.jda.commands.definitions.interactions.InteractionRegistry;
+import com.github.kaktushose.jda.commands.dispatching.Runtime;
 import com.github.kaktushose.jda.commands.dispatching.events.Event;
 import com.github.kaktushose.jda.commands.dispatching.events.ModalReplyableEvent;
-import com.github.kaktushose.jda.commands.reflect.InteractionRegistry;
-import com.github.kaktushose.jda.commands.reflect.interactions.EphemeralInteractionDefinition;
 import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent;
 import net.dv8tion.jda.api.events.interaction.component.EntitySelectInteractionEvent;
 import net.dv8tion.jda.api.events.interaction.component.GenericComponentInteractionCreateEvent;
@@ -15,26 +15,25 @@
 ///
 /// @see Event
 /// @see ModalReplyableEvent
-/// @since 4.0.0
 public final class ComponentEvent extends ModalReplyableEvent<GenericComponentInteractionCreateEvent> {
 
     /// Constructs a new CommandEvent.
     ///
-    /// @param event               the [GenericComponentInteractionCreateEvent] this event holds
-    /// @param interactionRegistry the corresponding [InteractionRegistry]
-    /// @param runtime             the corresponding [Runtime]
-    /// @param definition          the corresponding [EphemeralInteractionDefinition]
+    /// @param event      the [GenericComponentInteractionCreateEvent] this event holds
+    /// @param registry   the corresponding [InteractionRegistry]
+    /// @param runtime    the corresponding [Runtime]
+    /// @param definition the corresponding [InteractionDefinition]
     public ComponentEvent(@NotNull GenericComponentInteractionCreateEvent event,
-                          @NotNull InteractionRegistry interactionRegistry,
+                          @NotNull InteractionRegistry registry,
                           @NotNull Runtime runtime,
-                          @NotNull EphemeralInteractionDefinition definition) {
-        super(event, interactionRegistry, runtime, definition);
+                          @NotNull InteractionDefinition definition) {
+        super(event, registry, runtime, definition);
     }
 
     /// Returns the underlying [GenericComponentInteractionCreateEvent] and casts it to the given type.
     ///
     /// @param type a subtype of [GenericComponentInteractionCreateEvent], namely [ButtonInteractionEvent],
-    /// [EntitySelectInteractionEvent] or [StringSelectInteractionEvent]
+    ///                         [EntitySelectInteractionEvent] or [StringSelectInteractionEvent]
     /// @param <T>  a subtype of [GenericComponentInteractionCreateEvent]
     /// @return [T]
     public <T extends GenericComponentInteractionCreateEvent> T jdaEvent(Class<T> type) {
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/interactions/ModalEvent.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/interactions/ModalEvent.java
index c8f60a9a6..1401293b4 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/interactions/ModalEvent.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/interactions/ModalEvent.java
@@ -1,10 +1,10 @@
 package com.github.kaktushose.jda.commands.dispatching.events.interactions;
 
-import com.github.kaktushose.jda.commands.dispatching.internal.Runtime;
+import com.github.kaktushose.jda.commands.definitions.interactions.InteractionDefinition;
+import com.github.kaktushose.jda.commands.definitions.interactions.InteractionRegistry;
+import com.github.kaktushose.jda.commands.dispatching.Runtime;
 import com.github.kaktushose.jda.commands.dispatching.events.Event;
 import com.github.kaktushose.jda.commands.dispatching.events.ReplyableEvent;
-import com.github.kaktushose.jda.commands.reflect.InteractionRegistry;
-import com.github.kaktushose.jda.commands.reflect.interactions.EphemeralInteractionDefinition;
 import net.dv8tion.jda.api.events.interaction.ModalInteractionEvent;
 import net.dv8tion.jda.api.events.interaction.command.GenericCommandInteractionEvent;
 import org.jetbrains.annotations.NotNull;
@@ -13,20 +13,19 @@
 ///
 /// @see Event
 /// @see ReplyableEvent
-/// @since 4.0.0
 public final class ModalEvent extends ReplyableEvent<ModalInteractionEvent> {
 
     /// Constructs a new CommandEvent.
     ///
-    /// @param event               the [GenericCommandInteractionEvent] this event holds
-    /// @param interactionRegistry the corresponding [InteractionRegistry]
-    /// @param runtime             the corresponding [Runtime]
-    /// @param definition          the corresponding [EphemeralInteractionDefinition]
+    /// @param event      the [GenericCommandInteractionEvent] this event holds
+    /// @param registry   the corresponding [InteractionRegistry]
+    /// @param runtime    the corresponding [Runtime]
+    /// @param definition the corresponding [InteractionDefinition]
     public ModalEvent(@NotNull ModalInteractionEvent event,
-                      @NotNull InteractionRegistry interactionRegistry,
+                      @NotNull InteractionRegistry registry,
                       @NotNull Runtime runtime,
-                      @NotNull EphemeralInteractionDefinition definition) {
-        super(event, interactionRegistry, runtime, definition);
+                      @NotNull InteractionDefinition definition) {
+        super(event, registry, runtime, definition);
     }
 
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/interactions/package-info.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/interactions/package-info.java
index 323ac6561..d6ab0f93a 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/interactions/package-info.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/interactions/package-info.java
@@ -1,4 +1,2 @@
 /// Event classes that represent an interaction execution.
-///
-/// @since 4.0.0
 package com.github.kaktushose.jda.commands.dispatching.events.interactions;
\ No newline at end of file
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/package-info.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/package-info.java
index ea31d952d..7b75133c6 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/package-info.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/package-info.java
@@ -1,2 +1,2 @@
 /// Abstract event classes that build the foundation for specific event implementations.
-package com.github.kaktushose.jda.commands.dispatching.events;
\ No newline at end of file
+package com.github.kaktushose.jda.commands.dispatching.events;
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/ExpirationStrategy.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/expiration/ExpirationStrategy.java
similarity index 95%
rename from src/main/java/com/github/kaktushose/jda/commands/dispatching/ExpirationStrategy.java
rename to src/main/java/com/github/kaktushose/jda/commands/dispatching/expiration/ExpirationStrategy.java
index 78ffd3951..cd1d21f0b 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/ExpirationStrategy.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/expiration/ExpirationStrategy.java
@@ -1,4 +1,4 @@
-package com.github.kaktushose.jda.commands.dispatching;
+package com.github.kaktushose.jda.commands.dispatching.expiration;
 
 import com.github.kaktushose.jda.commands.dispatching.events.Event;
 
@@ -10,7 +10,6 @@
 ///
 /// @implNote The [Inactivity] strategy will check all active [`Runtimes`]({@docRoot}/index.html#runtime-concept-heading) at every incoming jda event. If a
 /// [`Runtime`]({@docRoot}/index.html#runtime-concept-heading) didn't handle any events in the last *x* minutes, it will be closed.
-/// @since 4.0.0
 public sealed interface ExpirationStrategy {
 
     /// Default [ExpirationStrategy] of [Inactivity], that closes [`Runtimes`]({@docRoot}/index.html#runtime-concept-heading) after *15* minutes of inactivity.
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/AutoCompleteHandler.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/AutoCompleteHandler.java
index cc10b7d86..4c68629ae 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/AutoCompleteHandler.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/AutoCompleteHandler.java
@@ -1,6 +1,7 @@
 package com.github.kaktushose.jda.commands.dispatching.handling;
 
-import com.github.kaktushose.jda.commands.dispatching.internal.Runtime;
+import com.github.kaktushose.jda.commands.definitions.interactions.AutoCompleteDefinition;
+import com.github.kaktushose.jda.commands.dispatching.Runtime;
 import com.github.kaktushose.jda.commands.dispatching.context.InvocationContext;
 import com.github.kaktushose.jda.commands.dispatching.events.interactions.AutoCompleteEvent;
 import net.dv8tion.jda.api.events.interaction.command.CommandAutoCompleteInteractionEvent;
@@ -21,10 +22,11 @@ public AutoCompleteHandler(DispatchingContext dispatchingContext) {
     protected InvocationContext<CommandAutoCompleteInteractionEvent> prepare(@NotNull CommandAutoCompleteInteractionEvent event, @NotNull Runtime runtime) {
         CommandAutoCompleteInteraction interaction = event.getInteraction();
 
-        return interactionRegistry.getAutoCompletes().stream()
-                .filter(it -> it.getCommandNames().stream().anyMatch(name -> interaction.getFullCommandName().startsWith(name)))
+        return registry.find(AutoCompleteDefinition.class,
+                        it -> it.commands().stream().anyMatch(name -> interaction.getFullCommandName().startsWith(name))
+                ).stream()
                 .findFirst()
-                .map(autoComplete -> new InvocationContext<>(event, runtime.keyValueStore(), autoComplete, List.of(new AutoCompleteEvent(event, interactionRegistry, runtime))))
+                .map(autoComplete -> new InvocationContext<>(event, runtime.keyValueStore(), autoComplete, List.of(new AutoCompleteEvent(event, registry, runtime))))
                 .orElseGet(() -> {
                     log.debug("No auto complete handler found for {}", interaction.getFullCommandName());
                     return null;
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/ComponentHandler.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/ComponentHandler.java
index 1093eaad4..c4d6854fb 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/ComponentHandler.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/ComponentHandler.java
@@ -1,10 +1,10 @@
 package com.github.kaktushose.jda.commands.dispatching.handling;
 
-import com.github.kaktushose.jda.commands.dispatching.internal.Runtime;
+import com.github.kaktushose.jda.commands.definitions.interactions.CustomId;
+import com.github.kaktushose.jda.commands.definitions.interactions.component.ComponentDefinition;
+import com.github.kaktushose.jda.commands.dispatching.Runtime;
 import com.github.kaktushose.jda.commands.dispatching.context.InvocationContext;
 import com.github.kaktushose.jda.commands.dispatching.events.interactions.ComponentEvent;
-import com.github.kaktushose.jda.commands.reflect.interactions.CustomId;
-import com.github.kaktushose.jda.commands.reflect.interactions.components.GenericComponentDefinition;
 import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent;
 import net.dv8tion.jda.api.events.interaction.component.EntitySelectInteractionEvent;
 import net.dv8tion.jda.api.events.interaction.component.GenericComponentInteractionCreateEvent;
@@ -29,8 +29,8 @@ protected InvocationContext<GenericComponentInteractionCreateEvent> prepare(@Not
             return null;
         }
 
-        var component = interactionRegistry.find(GenericComponentDefinition.class, true, it ->
-                it.getDefinitionId().equals(CustomId.definitionId(genericEvent.getComponentId()))
+        var component = registry.find(ComponentDefinition.class, true, it ->
+                it.definitionId().equals(CustomId.fromEvent(genericEvent).definitionId())
         );
 
         List<Object> arguments = switch (genericEvent) {
@@ -40,7 +40,7 @@ protected InvocationContext<GenericComponentInteractionCreateEvent> prepare(@Not
             default ->
                     throw new IllegalStateException("Should not occur. Please report this error the the devs of jda-commands.");
         };
-        arguments.addFirst(new ComponentEvent(genericEvent, interactionRegistry, runtime, component));
+        arguments.addFirst(new ComponentEvent(genericEvent, registry, runtime, component));
 
         return new InvocationContext<>(
                 genericEvent,
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/DispatchingContext.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/DispatchingContext.java
index 83f5f09f5..74112bf20 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/DispatchingContext.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/DispatchingContext.java
@@ -1,17 +1,17 @@
 package com.github.kaktushose.jda.commands.dispatching.handling;
 
-import com.github.kaktushose.jda.commands.dispatching.ExpirationStrategy;
+import com.github.kaktushose.jda.commands.definitions.interactions.InteractionRegistry;
+import com.github.kaktushose.jda.commands.dispatching.ImplementationRegistry;
 import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapterRegistry;
+import com.github.kaktushose.jda.commands.dispatching.expiration.ExpirationStrategy;
 import com.github.kaktushose.jda.commands.dispatching.middleware.MiddlewareRegistry;
-import com.github.kaktushose.jda.commands.reflect.ImplementationRegistry;
-import com.github.kaktushose.jda.commands.reflect.InteractionRegistry;
 import org.jetbrains.annotations.ApiStatus;
 
 /// A collection of classes relevant for [EventHandler]s.
 @ApiStatus.Internal
 public record DispatchingContext(MiddlewareRegistry middlewareRegistry,
                                  ImplementationRegistry implementationRegistry,
-                                 InteractionRegistry interactionRegistry,
+                                 InteractionRegistry registry,
                                  TypeAdapterRegistry adapterRegistry,
                                  ExpirationStrategy expirationStrategy) {
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/EventHandler.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/EventHandler.java
index 2919128e9..3b3d1175e 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/EventHandler.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/EventHandler.java
@@ -1,6 +1,9 @@
 package com.github.kaktushose.jda.commands.dispatching.handling;
 
-import com.github.kaktushose.jda.commands.dispatching.internal.Runtime;
+import com.github.kaktushose.jda.commands.definitions.interactions.InteractionDefinition;
+import com.github.kaktushose.jda.commands.definitions.interactions.InteractionRegistry;
+import com.github.kaktushose.jda.commands.dispatching.ImplementationRegistry;
+import com.github.kaktushose.jda.commands.dispatching.Runtime;
 import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapterRegistry;
 import com.github.kaktushose.jda.commands.dispatching.context.InvocationContext;
 import com.github.kaktushose.jda.commands.dispatching.handling.command.ContextCommandHandler;
@@ -8,9 +11,6 @@
 import com.github.kaktushose.jda.commands.dispatching.middleware.Middleware;
 import com.github.kaktushose.jda.commands.dispatching.middleware.MiddlewareRegistry;
 import com.github.kaktushose.jda.commands.dispatching.middleware.Priority;
-import com.github.kaktushose.jda.commands.reflect.ImplementationRegistry;
-import com.github.kaktushose.jda.commands.reflect.InteractionRegistry;
-import com.github.kaktushose.jda.commands.reflect.interactions.GenericInteractionDefinition;
 import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
@@ -32,25 +32,28 @@
 /// are executed ordered by their [Priority].
 ///
 /// 3. Invocation ([EventHandler#invoke(InvocationContext, Runtime)]):
-/// In this step the user implemented method is called with help of the right [GenericInteractionDefinition]
+/// In this step the user implemented method is called with help of the right [InteractionDefinition]
 @ApiStatus.Internal
 public abstract sealed class EventHandler<T extends GenericInteractionCreateEvent>
         implements BiConsumer<T, Runtime>
         permits AutoCompleteHandler, ComponentHandler, ModalHandler, ContextCommandHandler, SlashCommandHandler {
 
+    // will be replaced with ScopedValues when available
+    public static final ThreadLocal<Boolean> INVOCATION_PERMITTED = ThreadLocal.withInitial(() -> false);
+
     public static final Logger log = LoggerFactory.getLogger(EventHandler.class);
 
     protected final DispatchingContext dispatchingContext;
     protected final MiddlewareRegistry middlewareRegistry;
     protected final ImplementationRegistry implementationRegistry;
-    protected final InteractionRegistry interactionRegistry;
+    protected final InteractionRegistry registry;
     protected final TypeAdapterRegistry adapterRegistry;
 
     public EventHandler(DispatchingContext dispatchingContext) {
         this.dispatchingContext = dispatchingContext;
         this.middlewareRegistry = dispatchingContext.middlewareRegistry();
         this.implementationRegistry = dispatchingContext.implementationRegistry();
-        this.interactionRegistry = dispatchingContext.interactionRegistry();
+        this.registry = dispatchingContext.registry();
         this.adapterRegistry = dispatchingContext.adapterRegistry();
     }
 
@@ -87,14 +90,16 @@ private void invoke(@NotNull InvocationContext<T> invocation, @NotNull Runtime r
 
         var definition = invocation.definition();
 
-        log.info("Executing interaction \"{}\" for user \"{}\"", definition.getDisplayName(), invocation.event().getUser().getEffectiveName());
+        log.info("Executing interaction \"{}\" for user \"{}\"", definition.displayName(), invocation.event().getUser().getEffectiveName());
         try {
             log.debug("Invoking method \"{}.{}\" with following arguments: {}",
-                    definition.getMethod().getDeclaringClass().getName(),
-                    definition.getMethod().getName(),
+                    definition.clazzDescription().name(),
+                    definition.methodDescription().name(),
                     arguments
             );
             Object instance = runtime.instance(definition);
+
+            INVOCATION_PERMITTED.set(true);
             definition.invoke(instance, invocation);
         } catch (Exception exception) {
             log.error("Interaction execution failed!", exception);
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/ModalHandler.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/ModalHandler.java
index b055c33f1..c0f723773 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/ModalHandler.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/ModalHandler.java
@@ -1,10 +1,10 @@
 package com.github.kaktushose.jda.commands.dispatching.handling;
 
-import com.github.kaktushose.jda.commands.dispatching.internal.Runtime;
+import com.github.kaktushose.jda.commands.definitions.interactions.CustomId;
+import com.github.kaktushose.jda.commands.definitions.interactions.ModalDefinition;
+import com.github.kaktushose.jda.commands.dispatching.Runtime;
 import com.github.kaktushose.jda.commands.dispatching.context.InvocationContext;
 import com.github.kaktushose.jda.commands.dispatching.events.interactions.ModalEvent;
-import com.github.kaktushose.jda.commands.reflect.interactions.CustomId;
-import com.github.kaktushose.jda.commands.reflect.interactions.ModalDefinition;
 import net.dv8tion.jda.api.events.interaction.ModalInteractionEvent;
 import net.dv8tion.jda.api.interactions.modals.ModalMapping;
 import org.jetbrains.annotations.NotNull;
@@ -26,12 +26,12 @@ protected InvocationContext<ModalInteractionEvent> prepare(@NotNull ModalInterac
             return null;
         }
 
-        var modal = interactionRegistry.find(ModalDefinition.class, true, it ->
-                it.getDefinitionId().equals(CustomId.definitionId(event.getModalId()))
+        var modal = registry.find(ModalDefinition.class, true, it ->
+                it.definitionId().equals(CustomId.fromEvent(event).definitionId())
         );
 
         List<Object> arguments = event.getValues().stream().map(ModalMapping::getAsString).collect(Collectors.toList());
-        arguments.addFirst(new ModalEvent(event, interactionRegistry, runtime, modal));
+        arguments.addFirst(new ModalEvent(event, registry, runtime, modal));
 
         return new InvocationContext<>(
                 event,
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/command/ContextCommandHandler.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/command/ContextCommandHandler.java
index 5b782917c..bf7e7c741 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/command/ContextCommandHandler.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/command/ContextCommandHandler.java
@@ -1,11 +1,12 @@
 package com.github.kaktushose.jda.commands.dispatching.handling.command;
 
-import com.github.kaktushose.jda.commands.dispatching.internal.Runtime;
+import com.github.kaktushose.jda.commands.definitions.interactions.command.CommandDefinition;
+import com.github.kaktushose.jda.commands.definitions.interactions.command.ContextCommandDefinition;
+import com.github.kaktushose.jda.commands.dispatching.Runtime;
 import com.github.kaktushose.jda.commands.dispatching.context.InvocationContext;
 import com.github.kaktushose.jda.commands.dispatching.events.interactions.CommandEvent;
-import com.github.kaktushose.jda.commands.dispatching.handling.EventHandler;
 import com.github.kaktushose.jda.commands.dispatching.handling.DispatchingContext;
-import com.github.kaktushose.jda.commands.reflect.interactions.commands.ContextCommandDefinition;
+import com.github.kaktushose.jda.commands.dispatching.handling.EventHandler;
 import net.dv8tion.jda.api.events.interaction.command.GenericContextInteractionEvent;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
@@ -21,12 +22,12 @@ public ContextCommandHandler(DispatchingContext dispatchingContext) {
 
     @Override
     protected InvocationContext<GenericContextInteractionEvent<?>> prepare(@NotNull GenericContextInteractionEvent<?> event, @NotNull Runtime runtime) {
-        ContextCommandDefinition command = interactionRegistry.find(ContextCommandDefinition.class, true, it ->
-                it.getName().equals(event.getFullCommandName())
+        CommandDefinition command = registry.find(ContextCommandDefinition.class, true, it ->
+                it.name().equals(event.getFullCommandName())
         );
 
         return new InvocationContext<>(event, runtime.keyValueStore(), command,
-                List.of(new CommandEvent(event, interactionRegistry, runtime, command), event.getTarget())
+                List.of(new CommandEvent(event, registry, runtime, command), event.getTarget())
         );
     }
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/command/SlashCommandHandler.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/command/SlashCommandHandler.java
index 34f1efa65..f13135fb3 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/command/SlashCommandHandler.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/command/SlashCommandHandler.java
@@ -1,16 +1,15 @@
 package com.github.kaktushose.jda.commands.dispatching.handling.command;
 
-import com.github.kaktushose.jda.commands.dispatching.internal.Runtime;
+import com.github.kaktushose.jda.commands.definitions.interactions.command.SlashCommandDefinition;
+import com.github.kaktushose.jda.commands.dispatching.Runtime;
 import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapter;
 import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapterRegistry;
 import com.github.kaktushose.jda.commands.dispatching.context.InvocationContext;
 import com.github.kaktushose.jda.commands.dispatching.events.interactions.CommandEvent;
-import com.github.kaktushose.jda.commands.dispatching.handling.EventHandler;
 import com.github.kaktushose.jda.commands.dispatching.handling.DispatchingContext;
+import com.github.kaktushose.jda.commands.dispatching.handling.EventHandler;
 import com.github.kaktushose.jda.commands.dispatching.reply.MessageReply;
 import com.github.kaktushose.jda.commands.embeds.error.ErrorMessageFactory;
-import com.github.kaktushose.jda.commands.reflect.ParameterDefinition;
-import com.github.kaktushose.jda.commands.reflect.interactions.commands.SlashCommandDefinition;
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
@@ -29,8 +28,8 @@ public SlashCommandHandler(DispatchingContext dispatchingContext) {
 
     @Override
     protected InvocationContext<SlashCommandInteractionEvent> prepare(@NotNull SlashCommandInteractionEvent event, @NotNull Runtime runtime) {
-        SlashCommandDefinition command = interactionRegistry.find(SlashCommandDefinition.class, true, it ->
-                it.getName().equals(event.getFullCommandName())
+        SlashCommandDefinition command = registry.find(SlashCommandDefinition.class, true, it ->
+                it.name().equals(event.getFullCommandName())
         );
 
         return parseArguments(command, event, runtime)
@@ -40,18 +39,19 @@ protected InvocationContext<SlashCommandInteractionEvent> prepare(@NotNull Slash
     }
 
     private Optional<List<Object>> parseArguments(SlashCommandDefinition command, SlashCommandInteractionEvent event, Runtime runtime) {
-        var input = command.getActualParameters().stream()
+        var input = command.commandParameters().stream()
                 .map(it -> event.getOption(it.name()).getAsString())
                 .toArray(String[]::new);
 
         List<Object> arguments = new ArrayList<>();
-        arguments.addFirst(new CommandEvent(event, interactionRegistry, runtime, command));
+        arguments.addFirst(new CommandEvent(event, registry, runtime, command));
 
         ErrorMessageFactory messageFactory = implementationRegistry.getErrorMessageFactory();
 
         log.debug("Type adapting arguments...");
-        for (int i = 0; i < command.getActualParameters().size(); i++) {
-            ParameterDefinition parameter = command.getActualParameters().get(i);
+        var parameters = List.copyOf(command.commandParameters());
+        for (int i = 0; i < parameters.size(); i++) {
+            var parameter = parameters.get(i);
 
             // if parameter is array don't parse
             if (String[].class.isAssignableFrom(parameter.type())) {
@@ -63,7 +63,7 @@ private Optional<List<Object>> parseArguments(SlashCommandDefinition command, Sl
             String raw;
             // current parameter index == total amount of input, check if it's optional else cancel context
             if (i >= input.length) {
-                if (!parameter.isOptional()) {
+                if (!parameter.optional()) {
                     throw new IllegalStateException(
                             "Command input doesn't match parameter length! Please report this error the the devs of jda-commands."
                     );
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/Middleware.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/Middleware.java
index 302867b57..9721bea98 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/Middleware.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/Middleware.java
@@ -1,29 +1,23 @@
 package com.github.kaktushose.jda.commands.dispatching.middleware;
 
+import com.github.kaktushose.jda.commands.annotations.Implementation;
 import com.github.kaktushose.jda.commands.dispatching.context.InvocationContext;
 import net.dv8tion.jda.api.utils.messages.MessageCreateData;
 
 import java.util.function.Consumer;
 
-/**
- * Middlewares run just before an interaction event gets dispatched. They are used to perform additional checks or add
- * more info the {@link InvocationContext}. Either register them at the {@link MiddlewareRegistry} or use the
- * {@link com.github.kaktushose.jda.commands.annotations.Implementation Implementation} annotation. Middlewares can have
- * different {@link Priority Priorities} dictating their priority on execution.
- *
- * @see com.github.kaktushose.jda.commands.annotations.Implementation Implementation
- * @see MiddlewareRegistry
- * @since 4.0.0
- */
+/// Middlewares run just before an interaction event gets dispatched. They are used to perform additional checks or add
+/// more info the [InvocationContext]. Either register them at the [MiddlewareRegistry] or use the [Implementation]
+/// annotation. Middlewares can have different [Priorities][Priority] dictating their priority on execution.
+///
+/// @see Implementation Implementation
+/// @see MiddlewareRegistry
 @FunctionalInterface
 public interface Middleware extends Consumer<InvocationContext<?>> {
 
-    /**
-     * Executes this middleware with the given {@link InvocationContext}. Use {@link InvocationContext#cancel(MessageCreateData)}
-     * to cancel the execution chain.
-     *
-     * @param context the {@link InvocationContext} of the current interaction event
-     */
+    /// Executes this middleware with the given [InvocationContext]. Use [#cancel(MessageCreateData)] to cancel the execution chain.
+    ///
+    /// @param context the [InvocationContext] of the current interaction event
     void accept(InvocationContext<?> context);
 
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/MiddlewareRegistry.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/MiddlewareRegistry.java
index d98c94883..8334e1bdb 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/MiddlewareRegistry.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/MiddlewareRegistry.java
@@ -8,11 +8,7 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-/**
- * Central registry for all {@link Middleware Middlewares}.
- *
- * @since 4.0.0
- */
+/// Central registry for all [Middleware]s.
 public class MiddlewareRegistry {
 
     private static final Logger log = LoggerFactory.getLogger(MiddlewareRegistry.class);
@@ -23,63 +19,53 @@ public class MiddlewareRegistry {
             Priority.LOW, new HashSet<>()
     ));
 
-    /**
-     * Register {@link Middleware Middleware(s)} with the given {@link Priority}.
-     *
-     * @param priority    the {@link Priority} to register the {@link Middleware Middleware(s)} with
-     * @param first       the first {@link Middleware} to register
-     * @param middlewares additional {@link Middleware Middlewares} to register
-     * @return this instance for fluent interface
-     */
+    /// Register [Middleware(s)][Middleware] with the given [Priority].
+    ///
+    /// @param priority    the [Priority] to register the [Middleware(s)][Middleware] with
+    /// @param first       the first [Middleware] to register
+    /// @param middlewares additional [Middleware]s to register
+    /// @return this instance for fluent interface
     public MiddlewareRegistry register(Priority priority, Middleware first, Middleware... middlewares) {
         register(priority, Stream.concat(Stream.of(first), Arrays.stream(middlewares)).collect(Collectors.toList()));
         return this;
     }
 
-    /**
-     * Register {@link Middleware Middleware(s)} with the given {@link Priority}.
-     *
-     * @param priority    the {@link Priority} to register the {@link Middleware Middleware(s)} with
-     * @param middlewares the {@link Middleware Middleware(s)} to register
-     * @return this instance for fluent interface
-     */
+    /// Register [Middleware(s)][Middleware] with the given [Priority].
+    ///
+    /// @param priority    the [Priority] to register the [Middleware(s)][Middleware] with
+    /// @param middlewares the [Middleware(s)][Middleware] to register
+    /// @return this instance for fluent interface
     public MiddlewareRegistry register(Priority priority, Collection<Middleware> middlewares) {
         this.middlewares.get(priority).addAll(middlewares);
         log.debug("Registered middleware(s) {} with priority {}", middlewares, priority);
         return this;
     }
 
-    /**
-     * Unregister {@link Middleware Middleware(s)} with the given {@link Priority}.
-     *
-     * @param priority    the {@link Priority} to unregister the {@link Middleware Middleware(s)} with
-     * @param first       the first {@link Middleware} to unregister
-     * @param middlewares additional {@link Middleware Middlewares} to unregister
-     * @return this instance for fluent interface
-     */
+    /// Unregister [Middleware(s)][Middleware] with the given [Priority].
+    ///
+    /// @param priority    the [Priority] to unregister the [Middleware(s)][Middleware] with
+    /// @param first       the first [Middleware] to unregister
+    /// @param middlewares additional [Middlewares][Middleware] to unregister
+    /// @return this instance for fluent interface
     public MiddlewareRegistry unregister(Priority priority, Middleware first, Middleware... middlewares) {
         unregister(priority, Stream.concat(Stream.of(first), Arrays.stream(middlewares)).collect(Collectors.toList()));
         return this;
     }
 
-    /**
-     * Unregister {@link Middleware Middleware(s)} with the given {@link Priority}.
-     *
-     * @param priority    the {@link Priority} to unregister the {@link Middleware Middleware(s)} with
-     * @param middlewares the {@link Middleware Middleware(s)} to unregister
-     * @return this instance for fluent interface
-     */
+    /// Unregister [Middleware(s)][Middleware] with the given [Priority].
+    ///
+    /// @param priority    the [Priority] to unregister the [Middleware(s)][Middleware] with
+    /// @param middlewares the [Middleware(s)][Middleware] to unregister
+    /// @return this instance for fluent interface
     public MiddlewareRegistry unregister(Priority priority, Collection<Middleware> middlewares) {
         this.middlewares.get(priority).removeAll(middlewares);
         log.debug("Unregistered middleware(s) {}", middlewares);
         return this;
     }
 
-    /**
-     * Returns a set of all registered {@link Middleware Middlewares}, regardless of their priority.
-     *
-     * @return a set of all registered middlewares {@link Middleware Middlewares}
-     */
+    /// Returns a set of all registered [Middlewares][Middleware], regardless of their priority.
+    ///
+    /// @return a set of all registered middlewares [Middlewares][Middleware]
     public Set<Middleware> getMiddlewares() {
         return middlewares.sequencedValues()
                 .stream()
@@ -93,11 +79,9 @@ public void forAllOrdered(Consumer<Middleware> task) {
         }
     }
 
-    /**
-     * Returns a possibly-empty set of all registered {@link Middleware Middlewares} with the given {@link Priority}.
-     *
-     * @return a set of all registered middlewares {@link Middleware Middlewares} with the given {@link Priority}
-     */
+    /// Returns a possibly-empty set of all registered [Middlewares][Middleware] with the given [Priority].
+    ///
+    /// @return a set of all registered middlewares [Middlewares][Middleware] with the given [Priority]
     public Set<Middleware> getMiddlewares(Priority priority) {
         return Collections.unmodifiableSet(middlewares.get(priority));
     }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/Priority.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/Priority.java
index b2586056a..02bd02046 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/Priority.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/Priority.java
@@ -1,27 +1,16 @@
 package com.github.kaktushose.jda.commands.dispatching.middleware;
 
-/**
- * Enum to define with witch priority a {@link Middleware} should be executed.
- *
- * @see MiddlewareRegistry
- * @since 4.0.0
- */
+/// Enum to define with witch priority a [Middleware] should be executed.
+///
+/// @see MiddlewareRegistry
 // !! order matters, because enums are compared by ordinal number (java.lang.Comparable)
 public enum Priority {
-    /**
-     * Middlewares with priority PERMISSIONS will always be executed first
-     */
+    /// Middlewares with priority PERMISSIONS will always be executed first
     PERMISSIONS,
-    /**
-     * Highest priority for custom implementation, will be executed right after internal middlewares.
-     */
+    /// Highest priority for custom implementation, will be executed right after internal middlewares.
     HIGH,
-    /**
-     * Default priority.
-     */
+    /// Default priority.
     NORMAL,
-    /**
-     * Lowest priority, will be executed at the end
-     */
+    /// Lowest priority, will be executed at the end
     LOW
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/ConstraintMiddleware.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/ConstraintMiddleware.java
index 92be28ce9..d28587235 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/ConstraintMiddleware.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/ConstraintMiddleware.java
@@ -1,11 +1,10 @@
 package com.github.kaktushose.jda.commands.dispatching.middleware.impl;
 
+import com.github.kaktushose.jda.commands.definitions.interactions.command.ParameterDefinition;
+import com.github.kaktushose.jda.commands.definitions.interactions.command.SlashCommandDefinition;
+import com.github.kaktushose.jda.commands.dispatching.ImplementationRegistry;
 import com.github.kaktushose.jda.commands.dispatching.context.InvocationContext;
 import com.github.kaktushose.jda.commands.dispatching.middleware.Middleware;
-import com.github.kaktushose.jda.commands.reflect.ConstraintDefinition;
-import com.github.kaktushose.jda.commands.reflect.ImplementationRegistry;
-import com.github.kaktushose.jda.commands.reflect.ParameterDefinition;
-import com.github.kaktushose.jda.commands.reflect.interactions.commands.SlashCommandDefinition;
 import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -13,13 +12,10 @@
 import java.util.ArrayList;
 import java.util.List;
 
-/**
- * A {@link Middleware} implementation that will check the parameter constraints a
- * {@link SlashCommandDefinition} might have.
- *
- * @see com.github.kaktushose.jda.commands.dispatching.validation.ValidatorRegistry ValidatorRegistry
- * @since 2.0.0
- */
+/// A [Middleware] implementation that will check the parameter constraints a
+/// [SlashCommandDefinition] might have.
+///
+/// @see com.github.kaktushose.jda.commands.dispatching.validation.ValidatorRegistry ValidatorRegistry
 public class ConstraintMiddleware implements Middleware {
 
     private static final Logger log = LoggerFactory.getLogger(ConstraintMiddleware.class);
@@ -30,25 +26,23 @@ public ConstraintMiddleware(ImplementationRegistry implementationRegistry) {
         this.implementationRegistry = implementationRegistry;
     }
 
-    /**
-     * Checks if all parameters fulfill their constraints. Will cancel the {@link InvocationContext} if a parameter
-     * constraint fails.
-     *
-     * @param context the {@link InvocationContext} to filter
-     */
+    /// Checks if all parameters fulfill their constraints. Will cancel the [InvocationContext] if a parameter
+    /// constraint fails.
+    ///
+    /// @param context the [InvocationContext] to filter
     @Override
     public void accept(@NotNull InvocationContext<?> context) {
         if (!(context.definition() instanceof SlashCommandDefinition command))
             return;
 
         var arguments = new ArrayList<>(context.arguments());
-        List<ParameterDefinition> parameters = command.getParameters();
+        List<ParameterDefinition> parameters = List.copyOf(command.commandParameters());
 
         log.debug("Applying parameter constraints...");
         for (int i = 1; i < arguments.size(); i++) {
             Object argument = arguments.get(i);
             ParameterDefinition parameter = parameters.get(i);
-            for (ConstraintDefinition constraint : parameter.constraints()) {
+            for (ParameterDefinition.ConstraintDefinition constraint : parameter.constraints()) {
                 log.debug("Found constraint {} for parameter {}", constraint, parameter.type().getName());
 
                 boolean validated = constraint.validator().apply(argument, constraint.annotation(), context);
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/CooldownMiddleware.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/CooldownMiddleware.java
index f56be324f..13d9a3818 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/CooldownMiddleware.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/CooldownMiddleware.java
@@ -1,11 +1,11 @@
 package com.github.kaktushose.jda.commands.dispatching.middleware.impl;
 
 import com.github.kaktushose.jda.commands.annotations.interactions.Cooldown;
+import com.github.kaktushose.jda.commands.definitions.interactions.command.SlashCommandDefinition;
+import com.github.kaktushose.jda.commands.definitions.interactions.command.SlashCommandDefinition.CooldownDefinition;
+import com.github.kaktushose.jda.commands.dispatching.ImplementationRegistry;
 import com.github.kaktushose.jda.commands.dispatching.context.InvocationContext;
 import com.github.kaktushose.jda.commands.dispatching.middleware.Middleware;
-import com.github.kaktushose.jda.commands.reflect.CooldownDefinition;
-import com.github.kaktushose.jda.commands.reflect.ImplementationRegistry;
-import com.github.kaktushose.jda.commands.reflect.interactions.commands.SlashCommandDefinition;
 import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -16,15 +16,12 @@
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
-/**
- * A {@link Middleware} implementation that contains the business logic behind command cooldowns.
- * If the command isn't annotated with {@link Cooldown Cooldown} or more
- * formally if the {@link SlashCommandDefinition} doesn't hold a {@link CooldownDefinition} or the delay of the
- * {@link CooldownDefinition} amounts to {@code 0} this filter has no effect.
- *
- * @see Cooldown
- * @since 2.0.0
- */
+/// A [Middleware] implementation that contains the business logic behind command cooldowns.
+/// If the command isn't annotated with [Cooldown] or more
+/// formally if the [SlashCommandDefinition] doesn't hold a [CooldownDefinition] or the delay of the
+/// [CooldownDefinition] amounts to `0` this filter has no effect.
+///
+/// @see Cooldown
 public class CooldownMiddleware implements Middleware {
 
     private static final Logger log = LoggerFactory.getLogger(CooldownMiddleware.class);
@@ -36,15 +33,14 @@ public CooldownMiddleware(ImplementationRegistry implementationRegistry) {
         this.implementationRegistry = implementationRegistry;
     }
 
-    /**
-     * Checks if an active cooldown for the given {@link SlashCommandDefinition} exists and will eventually cancel the
-     * context.
-     *
-     * @param context the {@link InvocationContext} to filter
-     */
+    /// Checks if an active cooldown for the given [SlashCommandDefinition] exists and will eventually cancel the
+    /// context.
+    ///
+    /// @param context the [InvocationContext] to filter
     @Override
     public void accept(@NotNull InvocationContext<?> context) {
-        if (!(context.definition() instanceof SlashCommandDefinition command) || !command.hasCooldown()) return;
+        if (!(context.definition() instanceof SlashCommandDefinition command) || command.cooldown().delay() <= 0)
+            return;
 
         long id = context.event().getUser().getIdLong();
 
@@ -64,34 +60,13 @@ public void accept(@NotNull InvocationContext<?> context) {
             }
         }
 
-        CooldownDefinition cooldown = command.getCooldown();
+        CooldownDefinition cooldown = command.cooldown();
         long startTime = System.currentTimeMillis();
         long duration = cooldown.timeUnit().toMillis(cooldown.delay());
         activeCooldowns.get(id).add(new CooldownEntry(command, startTime, duration));
         log.debug("Added new cooldown entry for this user");
     }
 
-    private static class CooldownEntry {
-        private final SlashCommandDefinition command;
-        private final long startTime;
-        private final long duration;
-
-        public CooldownEntry(SlashCommandDefinition command, long startTime, long duration) {
-            this.command = command;
-            this.startTime = startTime;
-            this.duration = duration;
-        }
-
-        public SlashCommandDefinition getCommand() {
-            return command;
-        }
-
-        public long getStartTime() {
-            return startTime;
-        }
-
-        public long getDuration() {
-            return duration;
-        }
+    private record CooldownEntry(SlashCommandDefinition command, long startTime, long duration) {
     }
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/PermissionsMiddleware.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/PermissionsMiddleware.java
index aa8149205..2908691f7 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/PermissionsMiddleware.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/PermissionsMiddleware.java
@@ -1,10 +1,10 @@
 package com.github.kaktushose.jda.commands.dispatching.middleware.impl;
 
 import com.github.kaktushose.jda.commands.annotations.interactions.Permissions;
+import com.github.kaktushose.jda.commands.dispatching.ImplementationRegistry;
 import com.github.kaktushose.jda.commands.dispatching.context.InvocationContext;
 import com.github.kaktushose.jda.commands.dispatching.middleware.Middleware;
 import com.github.kaktushose.jda.commands.permissions.PermissionsProvider;
-import com.github.kaktushose.jda.commands.reflect.ImplementationRegistry;
 import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.User;
 import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent;
@@ -12,19 +12,16 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-/**
- * A {@link Middleware} implementation that will check permissions.
- * The default implementation can only handle discord permissions. However, the {@link PermissionsProvider} can be
- * used for own implementations.
- * This filter will first check against {@link PermissionsProvider#hasPermission(User, InvocationContext)} with a
- * {@link User} object. This can be used for global permissions. Afterward
- * {@link PermissionsProvider#hasPermission(User, InvocationContext)} will be called. Since the {@link Member} is
- * available this might be used for guild related permissions.
- *
- * @see Permissions
- * @see PermissionsProvider
- * @since 2.0.0
- */
+/// A [Middleware] implementation that will check permissions.
+/// The default implementation can only handle discord permissions. However, the [PermissionsProvider] can be
+/// used for own implementations.
+/// This filter will first check against [#hasPermission(User,InvocationContext)] with a
+/// [User] object. This can be used for global permissions. Afterward
+/// [#hasPermission(User,InvocationContext)] will be called. Since the [Member] is
+/// available this might be used for guild related permissions.
+///
+/// @see Permissions
+/// @see PermissionsProvider
 public class PermissionsMiddleware implements Middleware {
 
     private static final Logger log = LoggerFactory.getLogger(PermissionsMiddleware.class);
@@ -35,11 +32,9 @@ public PermissionsMiddleware(ImplementationRegistry implementationRegistry) {
         this.implementationRegistry = implementationRegistry;
     }
 
-    /**
-     * Checks if the {@link User} and respectively the {@link Member} has the permission to execute the command.
-     *
-     * @param context the {@link InvocationContext} to filter
-     */
+    /// Checks if the [User] and respectively the [Member] has the permission to execute the command.
+    ///
+    /// @param context the [InvocationContext] to filter
     @Override
     public void accept(@NotNull InvocationContext<?> context) {
         log.debug("Checking permissions...");
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/package-info.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/package-info.java
index e5ccf54b2..5c21dd980 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/package-info.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/package-info.java
@@ -1,4 +1,2 @@
-/**
- * Top-level package for all parts of the execution chain.
- */
+/// Top-level package for all parts of the execution chain.
 package com.github.kaktushose.jda.commands.dispatching;
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/Component.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/Component.java
index b7ffc4fe6..54ef65cbc 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/Component.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/Component.java
@@ -25,7 +25,6 @@
 ///     event.with().components(Components.of(true, false, "onButton")).reply();
 /// }
 ///```
-/// @since 2.3.0
 public record Component(boolean enabled, boolean independent, String name) {
 
     /// Adds enabled, runtime-bound [Component]s to the reply.
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/ComponentReply.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/ComponentReply.java
index 459223fc3..ab4286347 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/ComponentReply.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/ComponentReply.java
@@ -4,8 +4,6 @@
 import org.jetbrains.annotations.NotNull;
 
 /// Subtype of [ConfigurableReply] that allows replying only with a name without a message.
-///
-/// @since 4.0.0
 public final class ComponentReply extends ConfigurableReply {
 
     /// Constructs a new ComponentReply.
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/ConfigurableReply.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/ConfigurableReply.java
index 2d0177b60..e1d52f3fe 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/ConfigurableReply.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/ConfigurableReply.java
@@ -1,11 +1,13 @@
 package com.github.kaktushose.jda.commands.dispatching.reply;
 
 import com.github.kaktushose.jda.commands.annotations.interactions.ReplyConfig;
-import com.github.kaktushose.jda.commands.dispatching.internal.Runtime;
-import com.github.kaktushose.jda.commands.reflect.InteractionRegistry;
-import com.github.kaktushose.jda.commands.reflect.interactions.components.ButtonDefinition;
-import com.github.kaktushose.jda.commands.reflect.interactions.components.GenericComponentDefinition;
-import com.github.kaktushose.jda.commands.reflect.interactions.components.menus.GenericSelectMenuDefinition;
+import com.github.kaktushose.jda.commands.definitions.interactions.CustomId;
+import com.github.kaktushose.jda.commands.definitions.interactions.InteractionDefinition;
+import com.github.kaktushose.jda.commands.definitions.interactions.InteractionRegistry;
+import com.github.kaktushose.jda.commands.definitions.interactions.component.ButtonDefinition;
+import com.github.kaktushose.jda.commands.definitions.interactions.component.ComponentDefinition;
+import com.github.kaktushose.jda.commands.definitions.interactions.component.menu.SelectMenuDefinition;
+import com.github.kaktushose.jda.commands.dispatching.Runtime;
 import net.dv8tion.jda.api.interactions.components.ActionRow;
 import net.dv8tion.jda.api.interactions.components.ItemComponent;
 import org.jetbrains.annotations.NotNull;
@@ -31,11 +33,9 @@
 ///     }
 /// }
 /// ```
-///
-/// @since 4.0.0
 public sealed class ConfigurableReply extends MessageReply permits ComponentReply {
 
-    protected final InteractionRegistry interactionRegistry;
+    protected final InteractionRegistry registry;
     protected final String runtimeId;
 
     /// Constructs a new ConfigurableReply.
@@ -45,7 +45,7 @@ public sealed class ConfigurableReply extends MessageReply permits ComponentRepl
     /// @param runtimeId the corresponding [Runtime]
     public ConfigurableReply(@NotNull MessageReply reply, @NotNull InteractionRegistry registry, @NotNull String runtimeId) {
         super(reply);
-        this.interactionRegistry = registry;
+        this.registry = registry;
         this.runtimeId = runtimeId;
     }
 
@@ -54,7 +54,7 @@ public ConfigurableReply(@NotNull MessageReply reply, @NotNull InteractionRegist
     /// @param reply the [ConfigurableReply] to copy
     public ConfigurableReply(@NotNull ConfigurableReply reply) {
         super(reply);
-        this.interactionRegistry = reply.interactionRegistry;
+        this.registry = reply.registry;
         this.runtimeId = reply.runtimeId;
     }
 
@@ -131,7 +131,6 @@ public ConfigurableReply keepComponents(boolean keepComponents) {
     ///     }
     /// }
     /// ```
-    ///
     /// @param components the name of the components to add
     /// @return the current instance for fluent interface
     @NotNull
@@ -159,7 +158,6 @@ public ComponentReply components(@NotNull String... components) {
     ///     }
     /// }
     /// ```
-    ///
     /// @see Component
     /// @param components the [Component] to add
     /// @return the current instance for fluent interface
@@ -167,19 +165,21 @@ public ComponentReply components(@NotNull String... components) {
     public ComponentReply components(@NotNull Component... components) {
         List<ItemComponent> items = new ArrayList<>();
         for (Component component : components) {
-            var definitionId = String.valueOf((definition.getMethod().getDeclaringClass().getName() + component.name()).hashCode());
-            var definition = interactionRegistry.find(GenericComponentDefinition.class, false, it ->
-                    it.getDefinitionId().equals(definitionId)
+            var definitionId = String.valueOf((definition.methodDescription().declaringClass().getName() + component.name()).hashCode());
+            var definition = registry.find(ComponentDefinition.class, false, it ->
+                    it.definitionId().equals(definitionId)
             );
-            log.debug("Reply Debug: Adding component \"{}\" to the reply", definition.getDisplayName());
+            log.debug("Reply Debug: Adding component \"{}\" to the reply", definition.displayName());
             switch (definition) {
                 case ButtonDefinition buttonDefinition -> {
-                    var button = buttonDefinition.toButton().withDisabled(!component.enabled());
+                    var button = buttonDefinition.toJDAEntity().withDisabled(!component.enabled());
                     //only assign ids to non-link buttons
-                    items.add(button.getUrl() == null ? button.withId(createId(definition, component.independent())) : button);
+                    items.add(button.getUrl() == null ? button.withId(createId(definition, component.independent()).id()) : button);
+                }
+                case SelectMenuDefinition<?> menuDefinition -> {
+                    var menu = menuDefinition.toJDAEntity(createId(definition, component.independent()));
+                    items.add(menu.withDisabled(!component.enabled()));
                 }
-                case GenericSelectMenuDefinition<?> menuDefinition ->
-                        items.add(menuDefinition.toSelectMenu(createId(definition, component.independent()), component.enabled()));
             }
         }
         if (!items.isEmpty()) {
@@ -189,10 +189,10 @@ public ComponentReply components(@NotNull Component... components) {
         return new ComponentReply(this);
     }
 
-    private String createId(GenericComponentDefinition definition, boolean staticComponent) {
+    private CustomId createId(InteractionDefinition definition, boolean staticComponent) {
         return staticComponent
-                ? definition.independentCustomId()
-                : definition.boundCustomId(runtimeId);
+                ? CustomId.independent(definition.definitionId())
+                : new CustomId(runtimeId, definition.definitionId());
     }
 }
 
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/MessageReply.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/MessageReply.java
index b5cf325d3..59327768d 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/MessageReply.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/MessageReply.java
@@ -1,9 +1,7 @@
 package com.github.kaktushose.jda.commands.dispatching.reply;
 
+import com.github.kaktushose.jda.commands.definitions.interactions.InteractionDefinition;
 import com.github.kaktushose.jda.commands.dispatching.events.ReplyableEvent;
-import com.github.kaktushose.jda.commands.reflect.interactions.EphemeralInteractionDefinition;
-import com.github.kaktushose.jda.commands.reflect.interactions.GenericInteractionDefinition;
-import com.github.kaktushose.jda.commands.reflect.interactions.ReplyConfig;
 import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.entities.Message;
 import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent;
@@ -31,12 +29,11 @@
 ///
 /// @see ConfigurableReply
 /// @see ReplyableEvent
-/// @since 4.0.0
 public sealed class MessageReply implements Reply permits ConfigurableReply {
 
     protected static final Logger log = LoggerFactory.getLogger(MessageReply.class);
     protected final GenericInteractionCreateEvent event;
-    protected final GenericInteractionDefinition definition;
+    protected final InteractionDefinition definition;
     protected final MessageCreateBuilder builder;
     protected boolean ephemeral;
     protected boolean editReply;
@@ -45,12 +42,11 @@ public sealed class MessageReply implements Reply permits ConfigurableReply {
     /// Constructs a new MessageReply.
     ///
     /// @param event       the corresponding [GenericInteractionCreateEvent]
-    /// @param definition  the corresponding [GenericInteractionDefinition]. This is mostly needed by the
-    ///                                                         [ConfigurableReply]
-    /// @param replyConfig the [ReplyConfig] to use
+    /// @param definition  the corresponding [InteractionDefinition]. This is mostly needed by the [ConfigurableReply]
+    /// @param replyConfig the [InteractionDefinition.ReplyConfig] to use
     public MessageReply(@NotNull GenericInteractionCreateEvent event,
-                        @NotNull GenericInteractionDefinition definition,
-                        @NotNull ReplyConfig replyConfig) {
+                        @NotNull InteractionDefinition definition,
+                        @NotNull InteractionDefinition.ReplyConfig replyConfig) {
         this.event = event;
         this.definition = definition;
         this.ephemeral = replyConfig.ephemeral();
@@ -62,9 +58,8 @@ public MessageReply(@NotNull GenericInteractionCreateEvent event,
     /// Constructs a new MessageReply.
     ///
     /// @param event      the corresponding [GenericInteractionCreateEvent]
-    /// @param definition the corresponding [EphemeralInteractionDefinition]. This is mostly needed by the
-    ///                                                       [ConfigurableReply]
-    public MessageReply(@NotNull GenericInteractionCreateEvent event, @NotNull EphemeralInteractionDefinition definition) {
+    /// @param definition the corresponding [InteractionDefinition]. This is mostly needed by the [ConfigurableReply]
+    public MessageReply(@NotNull GenericInteractionCreateEvent event, @NotNull InteractionDefinition definition) {
         this(event, definition, definition.replyConfig());
     }
 
@@ -121,7 +116,7 @@ protected Message complete() {
         }
         log.debug(
                 "Replying to interaction \"{}\" with content: {} [ephemeral={}, editReply={}, keepComponents={}]",
-                definition.getDisplayName(), builder.build().toData(), ephemeral, editReply, keepComponents
+                definition.displayName(), builder.build().toData(), ephemeral, editReply, keepComponents
         );
         var hook = ((IDeferrableCallback) event).getHook();
         if (editReply) {
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/Reply.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/Reply.java
index b11c0ae39..cfe673258 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/Reply.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/Reply.java
@@ -1,7 +1,7 @@
 package com.github.kaktushose.jda.commands.dispatching.reply;
 
-import com.github.kaktushose.jda.commands.embeds.EmbedDTO;
 import com.github.kaktushose.jda.commands.dispatching.events.ReplyableEvent;
+import com.github.kaktushose.jda.commands.embeds.EmbedDTO;
 import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.entities.Message;
 import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent;
@@ -15,27 +15,20 @@
 /// always share the same reply methods.
 ///
 /// @see ReplyableEvent
-/// @since 4.0.0
 public sealed interface Reply permits MessageReply, ReplyableEvent {
 
     /// Acknowledgement of this event with a text message.
     ///
+    /// @param message the message to send
+    /// @return the [Message] that got created
     /// @implSpec Internally this method must call [RestAction#complete()], thus the [Message] object can get
     /// returned directly.
     ///
     /// This might throw [RuntimeException]s if JDA fails to send the message.
-    ///
-    /// @param message the message to send
-    /// @return the [Message] that got created
     Message reply(@NotNull String message);
 
     /// Acknowledgement of this event with a text message.
     ///
-    /// @implSpec Internally this method must call [RestAction#complete()], thus the [Message] object can get
-    /// returned directly.
-    ///
-    /// This might throw [RuntimeException]s if JDA fails to send the message.
-    ///
     /// @param format the message to send
     /// @param args   Arguments referenced by the format specifiers in the format string. If there are more arguments than
     ///               format specifiers, the extra arguments are ignored. The number of arguments is variable and may be
@@ -52,35 +45,32 @@ default Message reply(@NotNull String format, @NotNull Object... args) {
 
     /// Acknowledgement of this event with a text message.
     ///
+    /// @param message the [MessageCreateData] to send
+    /// @return the [Message] that got created
     /// @implSpec Internally this method must call [RestAction#complete()], thus the [Message] object can get
     /// returned directly.
     ///
     /// This might throw [RuntimeException]s if JDA fails to send the message.
-    ///
-    /// @param message the [MessageCreateData] to send
-    /// @return the [Message] that got created
     Message reply(@NotNull MessageCreateData message);
 
     /// Acknowledgement of this event with a text message.
     ///
+    /// @param builder the [EmbedBuilder] to send
+    /// @return the [Message] that got created
     /// @implSpec Internally this method must call [RestAction#complete()], thus the [Message] object can get
     /// returned directly.
     ///
     /// This might throw [RuntimeException]s if JDA fails to send the message.
-    ///
-    /// @param builder the [EmbedBuilder] to send
-    /// @return the [Message] that got created
     Message reply(@NotNull EmbedBuilder builder);
 
     /// Acknowledgement of this event with a text message.
     ///
+    /// @param embedDTO the [EmbedDTO] to send
+    /// @return the [Message] that got created
     /// @implSpec Internally this method must call [RestAction#complete()], thus the [Message] object can get
     /// returned directly.
     ///
     /// This might throw [RuntimeException]s if JDA fails to send the message.
-    ///
-    /// @param embedDTO the [EmbedDTO] to send
-    /// @return the [Message] that got created
     default Message reply(@NotNull EmbedDTO embedDTO) {
         return reply(embedDTO.toEmbedBuilder());
     }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/package-info.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/package-info.java
index 8415d4fbe..1d2cd2627 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/package-info.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/package-info.java
@@ -1,4 +1,2 @@
-/**
- * Classes for sending bot messages.
- */
+/// Classes for sending bot messages.
 package com.github.kaktushose.jda.commands.dispatching.reply;
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/Validator.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/Validator.java
index 0ff78da04..6a09c0fc5 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/Validator.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/Validator.java
@@ -3,24 +3,19 @@
 import com.github.kaktushose.jda.commands.dispatching.context.InvocationContext;
 import org.jetbrains.annotations.NotNull;
 
-/**
- * Generic top level interface for validators. A validator checks if a command argument fulfills the given constraint.
- *
- * @see com.github.kaktushose.jda.commands.annotations.Implementation
- * @see com.github.kaktushose.jda.commands.annotations.constraints.Constraint Constraint
- * @since 2.0.0
- */
+/// Generic top level interface for validators. A validator checks if a command argument fulfills the given constraint.
+///
+/// @see com.github.kaktushose.jda.commands.annotations.Implementation Implementation
+/// @see com.github.kaktushose.jda.commands.annotations.constraints.Constraint Constraint
 @FunctionalInterface
 public interface Validator {
 
-    /**
-     * Validates an argument.
-     *
-     * @param argument   the argument to validate
-     * @param annotation the corresponding annotation
-     * @param context    the corresponding {@link InvocationContext}
-     * @return {@code true} if the argument passes the constraints
-     */
+    /// Validates an argument.
+    ///
+    /// @param argument   the argument to validate
+    /// @param annotation the corresponding annotation
+    /// @param context    the corresponding [InvocationContext]
+    /// @return `true` if the argument passes the constraints
     boolean apply(@NotNull Object argument, @NotNull Object annotation, @NotNull InvocationContext<?> context);
 
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/ValidatorRegistry.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/ValidatorRegistry.java
index 4a7683c09..339357657 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/ValidatorRegistry.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/ValidatorRegistry.java
@@ -12,30 +12,24 @@
 import java.util.Map;
 import java.util.Optional;
 
-/**
- * Central registry for all {@link Validator Validators}.
- *
- * @see Validator
- * @since 2.0.0
- */
+/// Central registry for all [Validator]s.
+///
+/// @see Validator
 public class ValidatorRegistry {
 
     private final Logger log = LoggerFactory.getLogger(ValidatorRegistry.class);
     private final Map<Class<? extends Annotation>, Validator> validators;
 
-    /**
-     * Constructs a new ValidatorRegistry. This will register the following {@link Validator Validators} by default:
-     * <ul>
-     *     <li>{@link MinimumValidator}</li>
-     *     <li>{@link MaximumValidator}</li>
-     *     <li>{@link RoleValidator}</li>
-     *     <li>{@link NotRoleValidator}</li>
-     *     <li>{@link PermissionValidator}</li>
-     *     <li>{@link NotPermissionValidator}</li>
-     *     <li>{@link UserValidator}</li>
-     *     <li>{@link NotUserValidator}</li>
-     * </ul>
-     */
+    /// Constructs a new ValidatorRegistry. This will register the following [Validator]s by default:
+    ///
+    ///   - [MinimumValidator]
+    ///   - [MaximumValidator]
+    ///   - [RoleValidator]
+    ///   - [NotRoleValidator]
+    ///   - [PermissionValidator]
+    ///   - [NotPermissionValidator]
+    ///   - [UserValidator]
+    ///   - [NotUserValidator]
     public ValidatorRegistry() {
         validators = new HashMap<>();
         // default types
@@ -51,13 +45,11 @@ public ValidatorRegistry() {
         register(NotUser.class, new NotUserValidator());
     }
 
-    /**
-     * Register a {@link Validator} and map it to an annotation. Each annotation can only map to one {@link Validator}.
-     *
-     * @param annotation the type of the annotation to map the {@link Validator} to
-     * @param validator  the {@link Validator} to map
-     * @throws IllegalArgumentException if the annotation class isn't annotated with {@link Constraint}
-     */
+    /// Register a [Validator] and map it to an annotation. Each annotation can only map to one [Validator].
+    ///
+    /// @param annotation the type of the annotation to map the [Validator] to
+    /// @param validator  the [Validator] to map
+    /// @throws IllegalArgumentException if the annotation class isn't annotated with [Constraint]
     public void register(@NotNull Class<? extends Annotation> annotation, @NotNull Validator validator) {
         if (!annotation.isAnnotationPresent(Constraint.class)) {
             throw new IllegalArgumentException(Constraint.class.getCanonicalName() + " annotation must be present!");
@@ -66,24 +58,20 @@ public void register(@NotNull Class<? extends Annotation> annotation, @NotNull V
         log.debug("Registered validator {} for annotation {}", validator.getClass().getName(), annotation.getName());
     }
 
-    /**
-     * Unregisters the {@link Validator} mapped to the given annotation.
-     *
-     * @param annotation the class of the annotation to unregister
-     */
+    /// Unregisters the [Validator] mapped to the given annotation.
+    ///
+    /// @param annotation the class of the annotation to unregister
     public void unregister(Class<?> annotation) {
         validators.remove(annotation);
         log.debug("Unregistered validator for annotation {}", annotation.getName());
     }
 
-    /**
-     * Gets a {@link Validator} based on the annotation and the type to validate. Returns an empty {@link Optional} if
-     * the {@link Validator} cannot validate the given type.
-     *
-     * @param annotation the class of the annotation
-     * @param type       the type to validate
-     * @return an {@link Optional} holding the {@link Validator}
-     */
+    /// Gets a [Validator] based on the annotation and the type to validate. Returns an empty [Optional] if
+    /// the [Validator] cannot validate the given type.
+    ///
+    /// @param annotation the class of the annotation
+    /// @param type       the type to validate
+    /// @return an [Optional] holding the [Validator]
     public Optional<Validator> get(@NotNull Class<?> annotation, @NotNull Class<?> type) {
         Validator validator = validators.get(annotation);
 
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/MaximumValidator.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/MaximumValidator.java
index aa7db9d91..8d5a99838 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/MaximumValidator.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/MaximumValidator.java
@@ -5,22 +5,17 @@
 import com.github.kaktushose.jda.commands.dispatching.validation.Validator;
 import org.jetbrains.annotations.NotNull;
 
-/**
- * A {@link Validator} implementation that checks the {@link Max} constraint.
- *
- * @see Max
- * @since 2.0.0
- */
+/// A [Validator] implementation that checks the [Max] constraint.
+///
+/// @see Max
 public class MaximumValidator implements Validator {
 
-    /**
-     * Validates an argument. The argument must be a number whose value must be lower or equal to the specified maximum.
-     *
-     * @param argument   the argument to validate
-     * @param annotation the corresponding annotation
-     * @param context    the corresponding {@link InvocationContext}
-     * @return {@code true} if the argument is a number whose value is lower or equal to the specified maximum
-     */
+    /// Validates an argument. The argument must be a number whose value must be less or equal to the specified maximum.
+    ///
+    /// @param argument   the argument to validate
+    /// @param annotation the corresponding annotation
+    /// @param context    the corresponding [InvocationContext]
+    /// @return `true` if the argument is a number whose value is less or equal to the specified maximum
     @Override
     public boolean apply(@NotNull Object argument, @NotNull Object annotation, @NotNull InvocationContext<?> context) {
         Max max = (Max) annotation;
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/MinimumValidator.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/MinimumValidator.java
index 65146f562..8a0c59f68 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/MinimumValidator.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/MinimumValidator.java
@@ -5,23 +5,18 @@
 import com.github.kaktushose.jda.commands.dispatching.validation.Validator;
 import org.jetbrains.annotations.NotNull;
 
-/**
- * A {@link Validator} implementation that checks the {@link Min} constraint.
- *
- * @see Min
- * @since 2.0.0
- */
+/// A [Validator] implementation that checks the [Min] constraint.
+///
+/// @see Min
 public class MinimumValidator implements Validator {
 
-    /**
-     * Validates an argument. The argument must be a number whose value must be greater or equal to the specified
-     * minimum.
-     *
-     * @param argument   the argument to validate
-     * @param annotation the corresponding annotation
-     * @param context    the corresponding {@link InvocationContext}
-     * @return {@code true} if the argument is a number whose value is greater or equal to the specified minimum
-     */
+    /// Validates an argument. The argument must be a number whose value must be greater or equal to the specified
+    /// minimum.
+    ///
+    /// @param argument   the argument to validate
+    /// @param annotation the corresponding annotation
+    /// @param context    the corresponding [InvocationContext]
+    /// @return `true` if the argument is a number whose value is greater or equal to the specified minimum
     @Override
     public boolean apply(@NotNull Object argument, @NotNull Object annotation, @NotNull InvocationContext<?> context) {
         Min min = (Min) annotation;
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/NotPermissionValidator.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/NotPermissionValidator.java
index fceaa5518..5fe64f55f 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/NotPermissionValidator.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/NotPermissionValidator.java
@@ -10,24 +10,19 @@
 import java.util.HashSet;
 import java.util.Set;
 
-/**
- * A {@link Validator} implementation that checks the {@link NotPerm} constraint.
- *
- * @see NotPerm
- * @since 2.0.0
- */
+/// A [Validator] implementation that checks the [NotPerm] constraint.
+///
+/// @see NotPerm
 public class NotPermissionValidator implements Validator {
 
-    /**
-     * Validates an argument. The argument must be a user or member that <b>doesn't</b> have the specified discord
-     * permission.
-     *
-     * @param argument   the argument to validate
-     * @param annotation the corresponding annotation
-     * @param context    the corresponding {@link InvocationContext}
-     * @return {@code true} if the argument is a user or member that <b>doesn't</b> have the specified discord
-     * permission
-     */
+    /// Validates an argument. The argument must be a user or member that **doesn't** have the specified discord
+    /// permission.
+    ///
+    /// @param argument   the argument to validate
+    /// @param annotation the corresponding annotation
+    /// @param context    the corresponding [InvocationContext]
+    /// @return `true` if the argument is a user or member that **doesn't** have the specified discord
+    /// permission
     @Override
     public boolean apply(@NotNull Object argument, @NotNull Object annotation, @NotNull InvocationContext<?> context) {
         Set<Permission> permissions = new HashSet<>();
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/NotRoleValidator.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/NotRoleValidator.java
index cc2d53b3d..f9cf159c1 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/NotRoleValidator.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/NotRoleValidator.java
@@ -10,22 +10,17 @@
 
 import java.util.Optional;
 
-/**
- * A {@link Validator} implementation that checks the {@link NotRole} constraint.
- *
- * @see NotRole
- * @since 2.0.0
- */
+/// A [Validator] implementation that checks the [NotRole] constraint.
+///
+/// @see NotRole
 public class NotRoleValidator implements Validator {
 
-    /**
-     * Validates an argument. The argument must be a user or member that <b>doesn't</b>have the specified guild role.
-     *
-     * @param argument   the argument to validate
-     * @param annotation the corresponding annotation
-     * @param context    the corresponding {@link InvocationContext}
-     * @return {@code true} if the argument is a user or member that <b>doesn't</b> have the specified guild role
-     */
+    /// Validates an argument. The argument must be a user or member that **doesn't**have the specified guild role.
+    ///
+    /// @param argument   the argument to validate
+    /// @param annotation the corresponding annotation
+    /// @param context    the corresponding [InvocationContext]
+    /// @return `true` if the argument is a user or member that **doesn't** have the specified guild role
     @Override
     public boolean apply(@NotNull Object argument, @NotNull Object annotation, @NotNull InvocationContext<?> context) {
         NotRole roleAnnotation = (NotRole) annotation;
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/NotUserValidator.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/NotUserValidator.java
index b26acaee2..a078f2560 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/NotUserValidator.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/NotUserValidator.java
@@ -9,22 +9,17 @@
 
 import java.util.Optional;
 
-/**
- * A {@link Validator} implementation that checks the {@link NotUser} constraint.
- *
- * @see NotUser
- * @since 2.0.0
- */
+/// A [Validator] implementation that checks the [NotUser] constraint.
+///
+/// @see NotUser
 public class NotUserValidator implements Validator {
 
-    /**
-     * Validates an argument. The argument must <b>not</b> be the specified user or member.
-     *
-     * @param argument   the argument to validate
-     * @param annotation the corresponding annotation
-     * @param context    the corresponding {@link InvocationContext}
-     * @return {@code true} if the argument <b>isn't</b> the specified user or member
-     */
+    /// Validates an argument. The argument must **not** be the specified user or member.
+    ///
+    /// @param argument   the argument to validate
+    /// @param annotation the corresponding annotation
+    /// @param context    the corresponding [InvocationContext]
+    /// @return `true` if the argument **isn't** the specified user or member
     @Override
     public boolean apply(@NotNull Object argument, @NotNull Object annotation, @NotNull InvocationContext<?> context) {
         Member member = (Member) argument;
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/PermissionValidator.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/PermissionValidator.java
index 906d1b0c6..cc61c1d25 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/PermissionValidator.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/PermissionValidator.java
@@ -10,24 +10,18 @@
 import java.util.HashSet;
 import java.util.Set;
 
-/**
- * A {@link Validator} implementation that checks the {@link Perm} constraint.
- *
- * @see Perm
- * @since 2.0.0
- */
+/// A [Validator] implementation that checks the [Perm] constraint.
+///
+/// @see Perm
 public class PermissionValidator implements Validator {
 
-    /**
-     * Validates an argument. The argument must be a user or member that has the specified discord
-     * permission.
-     *
-     * @param argument   the argument to validate
-     * @param annotation the corresponding annotation
-     * @param context    the corresponding {@link InvocationContext}
-     * @return {@code true} if the argument is a user or member that has the specified discord
-     * permission
-     */
+    /// Validates an argument. The argument must be a user or member that has the specified discord permission.
+    ///
+    /// @param argument   the argument to validate
+    /// @param annotation the corresponding annotation
+    /// @param context    the corresponding [InvocationContext]
+    /// @return `true` if the argument is a user or member that has the specified discord
+    /// permission
     @Override
     public boolean apply(@NotNull Object argument, @NotNull Object annotation, @NotNull InvocationContext<?> context) {
         Set<Permission> permissions = new HashSet<>();
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/RoleValidator.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/RoleValidator.java
index d18c74cc8..c3f16642c 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/RoleValidator.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/RoleValidator.java
@@ -9,23 +9,18 @@
 
 import java.util.Optional;
 
-/**
- * A {@link Validator} implementation that checks the
- * {@link com.github.kaktushose.jda.commands.annotations.constraints.Role Role} constraint.
- *
- * @see com.github.kaktushose.jda.commands.annotations.constraints.Role Role
- * @since 2.0.0
- */
+/// A [Validator] implementation that checks the
+/// [Role][com.github.kaktushose.jda.commands.annotations.constraints.Role] constraint.
+///
+/// @see com.github.kaktushose.jda.commands.annotations.constraints.Role Role
 public class RoleValidator implements Validator {
 
-    /**
-     * Validates an argument. The argument must be a user or member that has the specified guild role.
-     *
-     * @param argument   the argument to validate
-     * @param annotation the corresponding annotation
-     * @param context    the corresponding {@link InvocationContext}
-     * @return {@code true} if the argument is a user or member that has the specified guild role
-     */
+    /// Validates an argument. The argument must be a user or member that has the specified guild role.
+    ///
+    /// @param argument   the argument to validate
+    /// @param annotation the corresponding annotation
+    /// @param context    the corresponding [InvocationContext]
+    /// @return `true` if the argument is a user or member that has the specified guild role
     @Override
     public boolean apply(@NotNull Object argument, @NotNull Object annotation, @NotNull InvocationContext<?> context) {
         com.github.kaktushose.jda.commands.annotations.constraints.Role roleAnnotation =
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/UserValidator.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/UserValidator.java
index 7976bc50a..1f898954c 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/UserValidator.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/UserValidator.java
@@ -9,22 +9,17 @@
 
 import java.util.Optional;
 
-/**
- * A {@link Validator} implementation that checks the {@link User} constraint.
- *
- * @see User
- * @since 2.0.0
- */
+/// A [Validator] implementation that checks the [User] constraint.
+///
+/// @see User
 public class UserValidator implements Validator {
 
-    /**
-     * Validates an argument. The argument must be the specified user or member.
-     *
-     * @param argument   the argument to validate
-     * @param annotation the corresponding annotation
-     * @param context    the corresponding {@link InvocationContext}
-     * @return {@code true} if the argument is the specified user or member
-     */
+    /// Validates an argument. The argument must be the specified user or member.
+    ///
+    /// @param argument   the argument to validate
+    /// @param annotation the corresponding annotation
+    /// @param context    the corresponding [InvocationContext]
+    /// @return `true` if the argument is the specified user or member
     @Override
     public boolean apply(@NotNull Object argument, @NotNull Object annotation, @NotNull InvocationContext<?> context) {
         Member member = (Member) argument;
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/package-info.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/package-info.java
index 5205ad272..bc27eb106 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/package-info.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/package-info.java
@@ -1,4 +1,2 @@
-/**
- * Implementations of frequently used validators.
- */
+/// Implementations of frequently used validators.
 package com.github.kaktushose.jda.commands.dispatching.validation.impl;
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/package-info.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/package-info.java
index 07be39833..db2b8eec4 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/package-info.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/package-info.java
@@ -1,4 +1,2 @@
-/**
- * Command parameter validation system.
- */
+/// Command parameter validation system.
 package com.github.kaktushose.jda.commands.dispatching.validation;
diff --git a/src/main/java/com/github/kaktushose/jda/commands/embeds/EmbedCache.java b/src/main/java/com/github/kaktushose/jda/commands/embeds/EmbedCache.java
index bdccce0be..4543453f6 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/embeds/EmbedCache.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/embeds/EmbedCache.java
@@ -15,12 +15,9 @@
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-/**
- * This class loads and caches embeds from a json file.
- *
- * @see EmbedDTO
- * @since 1.1.0
- */
+/// This class loads and caches embeds from a json file.
+///
+/// @see EmbedDTO
 public class EmbedCache {
 
     private static final Logger log = LoggerFactory.getLogger(EmbedCache.class);
@@ -29,11 +26,9 @@ public class EmbedCache {
     private final InputStream stream;
     private final Map<String, EmbedDTO> embedMap;
 
-    /**
-     * Constructs a new EmbedCache object.
-     *
-     * @param file the file to load the embeds from
-     */
+    /// Constructs a new EmbedCache object.
+    ///
+    /// @param file the file to load the embeds from
     public EmbedCache(File file) {
         embedMap = new ConcurrentHashMap<>();
         this.file = file;
@@ -41,11 +36,9 @@ public EmbedCache(File file) {
         loadEmbeds();
     }
 
-    /**
-     * Constructs a new EmbedCache object.
-     *
-     * @param stream the stream to load the embeds from
-     */
+    /// Constructs a new EmbedCache object.
+    ///
+    /// @param stream the stream to load the embeds from
     public EmbedCache(InputStream stream) {
         embedMap = new ConcurrentHashMap<>();
         this.stream = stream;
@@ -53,11 +46,9 @@ public EmbedCache(InputStream stream) {
         loadEmbeds();
     }
 
-    /**
-     * Constructs a new EmbedCache object.
-     *
-     * @param file the path to the file to load the embeds from
-     */
+    /// Constructs a new EmbedCache object.
+    ///
+    /// @param file the path to the file to load the embeds from
     public EmbedCache(String file) {
         embedMap = new ConcurrentHashMap<>();
         this.file = new File(file);
@@ -65,20 +56,8 @@ public EmbedCache(String file) {
         loadEmbeds();
     }
 
-    /**
-     * Loads all embeds from a file and caches them.
-     *
-     * @deprecated This now happens automatically. Use {@link #loadEmbeds()} if you want to reload the cache
-     */
-    @Deprecated
-    public void loadEmbedsToCache() {
-        loadEmbeds();
-    }
-
-    /**
-     * Loads all embeds from a file and stores them. This happens automatically each time you construct a new
-     * EmbedCache. Thus, it's <b>not</b> needed to call this method manually, unless you want to reload the embeds.
-     */
+    /// Loads all embeds from a file and stores them. This happens automatically each time you construct a new
+    /// EmbedCache. Thus, it's **not** needed to call this method manually, unless you want to reload the embeds.
     public void loadEmbeds() {
         try {
             Reader reader;
@@ -100,49 +79,39 @@ public void loadEmbeds() {
         }
     }
 
-    /**
-     * Gets an embed from the cache.
-     *
-     * @param name the name the {@link EmbedDTO} is mapped to
-     * @return the {@link EmbedDTO} or {@code null} if the cache contains no mapping for the key
-     */
+    /// Gets an embed from the cache.
+    ///
+    /// @param name the name the [EmbedDTO] is mapped to
+    /// @return the [EmbedDTO] or `null` if the cache contains no mapping for the key
     public EmbedDTO getEmbed(@Nonnull String name) {
         return new EmbedDTO(embedMap.get(name));
     }
 
-    /**
-     * Returns {@code true} if this cache contains no {@link EmbedDTO}s.
-     *
-     * @return {@code true} if this cache contains no {@link EmbedDTO}s.
-     */
+    /// Returns `true` if this cache contains no [EmbedDTO]s.
+    ///
+    /// @return `true` if this cache contains no [EmbedDTO]s.
     public boolean isEmpty() {
         return embedMap.isEmpty();
     }
 
-    /**
-     * Returns the number of {@link EmbedDTO}s in this cache.
-     *
-     * @return the number of {@link EmbedDTO}s in this cache.
-     */
+    /// Returns the number of [EmbedDTO]s in this cache.
+    ///
+    /// @return the number of [EmbedDTO]s in this cache.
     public int size() {
         return embedMap.size();
     }
 
-    /**
-     * Returns {@code true} if this cache contains a mapping for the specified name.
-     *
-     * @param name the name the {@link EmbedDTO} is mapped to
-     * @return {@code true} if this cache contains a mapping for the specified name.
-     */
+    /// Returns `true` if this cache contains a mapping for the specified name.
+    ///
+    /// @param name the name the [EmbedDTO] is mapped to
+    /// @return `true` if this cache contains a mapping for the specified name.
     public boolean containsEmbed(@Nonnull String name) {
         return embedMap.containsKey(name);
     }
 
-    /**
-     * Returns an unmodifiable List containing all {@link EmbedDTO} of this cache.
-     *
-     * @return an unmodifiable List containing all {@link EmbedDTO} of this cache.
-     */
+    /// Returns an unmodifiable List containing all [EmbedDTO] of this cache.
+    ///
+    /// @return an unmodifiable List containing all [EmbedDTO] of this cache.
     public List<EmbedDTO> values() {
         return List.copyOf(embedMap.values());
     }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/embeds/EmbedDTO.java b/src/main/java/com/github/kaktushose/jda/commands/embeds/EmbedDTO.java
index a48aad66b..bf985df9e 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/embeds/EmbedDTO.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/embeds/EmbedDTO.java
@@ -24,7 +24,6 @@
  *
  * @see <a href="https://discord.com/developers/docs/resources/channel#embed-object">Discord Embed Documentation</a>
  * @see EmbedCache
- * @since 1.1.0
  */
 public class EmbedDTO implements Serializable {
 
diff --git a/src/main/java/com/github/kaktushose/jda/commands/embeds/error/DefaultErrorMessageFactory.java b/src/main/java/com/github/kaktushose/jda/commands/embeds/error/DefaultErrorMessageFactory.java
index 39033ac18..961c4e908 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/embeds/error/DefaultErrorMessageFactory.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/embeds/error/DefaultErrorMessageFactory.java
@@ -1,9 +1,9 @@
 package com.github.kaktushose.jda.commands.embeds.error;
 
+import com.github.kaktushose.jda.commands.definitions.interactions.InteractionDefinition;
+import com.github.kaktushose.jda.commands.definitions.interactions.command.ParameterDefinition;
+import com.github.kaktushose.jda.commands.definitions.interactions.command.SlashCommandDefinition;
 import com.github.kaktushose.jda.commands.dispatching.events.interactions.CommandEvent;
-import com.github.kaktushose.jda.commands.reflect.ConstraintDefinition;
-import com.github.kaktushose.jda.commands.reflect.interactions.GenericInteractionDefinition;
-import com.github.kaktushose.jda.commands.reflect.interactions.commands.SlashCommandDefinition;
 import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.entities.MessageEmbed;
 import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent;
@@ -16,23 +16,20 @@
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
-/**
- * Implementation of {@link ErrorMessageFactory} with default embeds.
- *
- * @see JsonErrorMessageFactory
- * @since 2.0.0
- */
+/// Implementation of [ErrorMessageFactory] with default embeds.
+///
+/// @see JsonErrorMessageFactory
 public class DefaultErrorMessageFactory implements ErrorMessageFactory {
 
     @NotNull
     @Override
     public MessageCreateData getTypeAdaptingFailedMessage(@NotNull GenericInteractionCreateEvent event,
-                                                          @NotNull GenericInteractionDefinition definition,
+                                                          @NotNull InteractionDefinition definition,
                                                           @NotNull List<String> userInput) {
         StringBuilder sbExpected = new StringBuilder();
         SlashCommandDefinition command = (SlashCommandDefinition) definition;
 
-        command.getParameters().forEach(parameter -> {
+        command.commandParameters().forEach(parameter -> {
             if (CommandEvent.class.isAssignableFrom(parameter.type())) {
                 return;
             }
@@ -51,7 +48,7 @@ public MessageCreateData getTypeAdaptingFailedMessage(@NotNull GenericInteractio
         MessageEmbed embed = new EmbedBuilder()
                 .setColor(Color.ORANGE)
                 .setTitle("Syntax Error")
-                .setDescription(command.getDisplayName())
+                .setDescription(command.displayName())
                 .addField("Expected", String.format("`%s`", expected), false)
                 .addField("Actual", String.format("`%s`", actual), false)
                 .build();
@@ -61,15 +58,15 @@ public MessageCreateData getTypeAdaptingFailedMessage(@NotNull GenericInteractio
 
     @NotNull
     @Override
-    public MessageCreateData getInsufficientPermissionsMessage(@NotNull GenericInteractionDefinition interaction) {
+    public MessageCreateData getInsufficientPermissionsMessage(@NotNull InteractionDefinition interaction) {
         StringBuilder sbPermissions = new StringBuilder();
-        interaction.getPermissions().forEach(permission -> sbPermissions.append(permission).append(", "));
+        interaction.permissions().forEach(permission -> sbPermissions.append(permission).append(", "));
         String permissions = sbPermissions.toString().isEmpty() ? "N/A" : sbPermissions.substring(0, sbPermissions.length() - 2);
         MessageEmbed embed = new EmbedBuilder()
                 .setColor(Color.RED)
                 .setTitle("Insufficient Permissions")
                 .setDescription(String.format("`%s` requires specific permissions to be executed",
-                        interaction.getDisplayName()))
+                        interaction.displayName()))
                 .addField("Permissions:",
                         String.format("`%s`", permissions), false
                 ).build();
@@ -78,7 +75,7 @@ public MessageCreateData getInsufficientPermissionsMessage(@NotNull GenericInter
 
     @NotNull
     @Override
-    public MessageCreateData getConstraintFailedMessage(@NotNull ConstraintDefinition constraint) {
+    public MessageCreateData getConstraintFailedMessage(@NotNull ParameterDefinition.ConstraintDefinition constraint) {
         return new MessageCreateBuilder().setEmbeds(new EmbedBuilder()
                 .setColor(Color.ORANGE)
                 .setTitle("Parameter Error")
diff --git a/src/main/java/com/github/kaktushose/jda/commands/embeds/error/ErrorMessageFactory.java b/src/main/java/com/github/kaktushose/jda/commands/embeds/error/ErrorMessageFactory.java
index d765ffc59..763224044 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/embeds/error/ErrorMessageFactory.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/embeds/error/ErrorMessageFactory.java
@@ -1,8 +1,8 @@
 package com.github.kaktushose.jda.commands.embeds.error;
 
 import com.github.kaktushose.jda.commands.annotations.Implementation;
-import com.github.kaktushose.jda.commands.reflect.ConstraintDefinition;
-import com.github.kaktushose.jda.commands.reflect.interactions.GenericInteractionDefinition;
+import com.github.kaktushose.jda.commands.definitions.interactions.InteractionDefinition;
+import com.github.kaktushose.jda.commands.definitions.interactions.command.ParameterDefinition.ConstraintDefinition;
 import net.dv8tion.jda.api.entities.Message;
 import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent;
 import net.dv8tion.jda.api.utils.messages.MessageCreateData;
@@ -14,26 +14,25 @@
 ///
 /// @see Implementation
 /// @see DefaultErrorMessageFactory
-/// @since 2.0.0
 public interface ErrorMessageFactory {
 
     /// Gets a [MessageCreateData] to send when type adapting of the user input failed.
     ///
-    /// @param event the [GenericInteractionCreateEvent] that was attempted to type adapt
-    /// @param definition the underlying [GenericInteractionDefinition]
-    /// @param userInput the input the user provided
+    /// @param event      the [GenericInteractionCreateEvent] that was attempted to type adapt
+    /// @param definition the underlying [InteractionDefinition]
+    /// @param userInput  the input the user provided
     /// @return a [MessageCreateData] to send when type adapting failed
     @NotNull
     MessageCreateData getTypeAdaptingFailedMessage(@NotNull GenericInteractionCreateEvent event,
-                                                   @NotNull GenericInteractionDefinition definition,
+                                                   @NotNull InteractionDefinition definition,
                                                    @NotNull List<String> userInput);
 
     /// Gets a [MessageCreateData] to send when a user is missing permissions.
     ///
-    /// @param definition the corresponding [GenericInteractionDefinition]
+    /// @param definition the corresponding [InteractionDefinition]
     /// @return a [MessageCreateData] to send when a user is missing permissions
     @NotNull
-    MessageCreateData getInsufficientPermissionsMessage(@NotNull GenericInteractionDefinition definition);
+    MessageCreateData getInsufficientPermissionsMessage(@NotNull InteractionDefinition definition);
 
     /// Gets a [MessageCreateData] to send when a parameter constraint fails.
     ///
diff --git a/src/main/java/com/github/kaktushose/jda/commands/embeds/error/JsonErrorMessageFactory.java b/src/main/java/com/github/kaktushose/jda/commands/embeds/error/JsonErrorMessageFactory.java
index fb0550194..eac74993f 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/embeds/error/JsonErrorMessageFactory.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/embeds/error/JsonErrorMessageFactory.java
@@ -1,10 +1,10 @@
 package com.github.kaktushose.jda.commands.embeds.error;
 
+import com.github.kaktushose.jda.commands.definitions.interactions.InteractionDefinition;
+import com.github.kaktushose.jda.commands.definitions.interactions.command.ParameterDefinition;
+import com.github.kaktushose.jda.commands.definitions.interactions.command.SlashCommandDefinition;
 import com.github.kaktushose.jda.commands.dispatching.events.interactions.CommandEvent;
 import com.github.kaktushose.jda.commands.embeds.EmbedCache;
-import com.github.kaktushose.jda.commands.reflect.ConstraintDefinition;
-import com.github.kaktushose.jda.commands.reflect.interactions.GenericInteractionDefinition;
-import com.github.kaktushose.jda.commands.reflect.interactions.commands.SlashCommandDefinition;
 import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent;
 import net.dv8tion.jda.api.utils.messages.MessageCreateData;
 import org.jetbrains.annotations.NotNull;
@@ -13,13 +13,10 @@
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
-/**
- * Subtype of {@link DefaultErrorMessageFactory} that can load the embeds from an {@link EmbedCache}.
- *
- * @see DefaultErrorMessageFactory
- * @see EmbedCache
- * @since 2.0.0
- */
+/// Subtype of [DefaultErrorMessageFactory] that can load the embeds from an [EmbedCache].
+///
+/// @see DefaultErrorMessageFactory
+/// @see EmbedCache
 public class JsonErrorMessageFactory extends DefaultErrorMessageFactory {
 
     private final EmbedCache embedCache;
@@ -31,7 +28,7 @@ public JsonErrorMessageFactory(EmbedCache embedCache) {
     @NotNull
     @Override
     public MessageCreateData getTypeAdaptingFailedMessage(@NotNull GenericInteractionCreateEvent event,
-                                                          @NotNull GenericInteractionDefinition definition,
+                                                          @NotNull InteractionDefinition definition,
                                                           @NotNull List<String> userInput) {
         if (!embedCache.containsEmbed("typeAdaptingFailed")) {
             return super.getTypeAdaptingFailedMessage(event, definition, userInput);
@@ -40,7 +37,7 @@ public MessageCreateData getTypeAdaptingFailedMessage(@NotNull GenericInteractio
         StringBuilder sbExpected = new StringBuilder();
         SlashCommandDefinition command = (SlashCommandDefinition) definition;
 
-        command.getParameters().forEach(parameter -> {
+        command.commandParameters().forEach(parameter -> {
             if (CommandEvent.class.isAssignableFrom(parameter.type())) {
                 return;
             }
@@ -57,7 +54,7 @@ public MessageCreateData getTypeAdaptingFailedMessage(@NotNull GenericInteractio
         String actual = sbActual.toString().isEmpty() ? " " : sbActual.substring(0, sbActual.length() - 2);
 
         return embedCache.getEmbed("typeAdaptingFailed")
-                .injectValue("usage", command.getDisplayName())
+                .injectValue("usage", command.displayName())
                 .injectValue("expected", expected)
                 .injectValue("actual", actual)
                 .toMessageCreateData();
@@ -65,24 +62,24 @@ public MessageCreateData getTypeAdaptingFailedMessage(@NotNull GenericInteractio
 
     @NotNull
     @Override
-    public MessageCreateData getInsufficientPermissionsMessage(@NotNull GenericInteractionDefinition interaction) {
+    public MessageCreateData getInsufficientPermissionsMessage(@NotNull InteractionDefinition interaction) {
         if (!embedCache.containsEmbed("insufficientPermissions")) {
             return super.getInsufficientPermissionsMessage(interaction);
         }
 
         StringBuilder sbPermissions = new StringBuilder();
-        interaction.getPermissions().forEach(permission -> sbPermissions.append(permission).append(", "));
+        interaction.permissions().forEach(permission -> sbPermissions.append(permission).append(", "));
         String permissions = sbPermissions.toString().isEmpty() ? "N/A" : sbPermissions.substring(0, sbPermissions.length() - 2);
 
         return embedCache.getEmbed("insufficientPermissions")
-                .injectValue("name", interaction.getDisplayName())
+                .injectValue("name", interaction.displayName())
                 .injectValue("permissions", permissions)
                 .toMessageCreateData();
     }
 
     @NotNull
     @Override
-    public MessageCreateData getConstraintFailedMessage(@NotNull ConstraintDefinition constraint) {
+    public MessageCreateData getConstraintFailedMessage(@NotNull ParameterDefinition.ConstraintDefinition constraint) {
         if (!embedCache.containsEmbed("constraintFailed")) {
             return super.getConstraintFailedMessage(constraint);
         }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/embeds/error/package-info.java b/src/main/java/com/github/kaktushose/jda/commands/embeds/error/package-info.java
index f073afe16..df2ef3714 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/embeds/error/package-info.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/embeds/error/package-info.java
@@ -1,4 +1,2 @@
-/**
- * Factory classes for generating error embeds.
- */
+/// Factory classes for generating error embeds.
 package com.github.kaktushose.jda.commands.embeds.error;
diff --git a/src/main/java/com/github/kaktushose/jda/commands/internal/Helpers.java b/src/main/java/com/github/kaktushose/jda/commands/internal/Helpers.java
index 9145cc7c2..d5f1135a1 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/internal/Helpers.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/internal/Helpers.java
@@ -2,7 +2,11 @@
 
 import com.github.kaktushose.jda.commands.annotations.interactions.Permissions;
 import com.github.kaktushose.jda.commands.annotations.interactions.ReplyConfig;
-import com.github.kaktushose.jda.commands.reflect.MethodBuildContext;
+import com.github.kaktushose.jda.commands.definitions.description.MethodDescription;
+import com.github.kaktushose.jda.commands.definitions.description.ParameterDescription;
+import com.github.kaktushose.jda.commands.definitions.interactions.InteractionDefinition;
+import com.github.kaktushose.jda.commands.definitions.interactions.MethodBuildContext;
+import com.github.kaktushose.jda.commands.dispatching.reply.GlobalReplyConfig;
 import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.channel.middleman.GuildChannel;
 import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent;
@@ -12,14 +16,11 @@
 import org.slf4j.LoggerFactory;
 
 import java.lang.reflect.Method;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Optional;
-import java.util.Set;
+import java.util.*;
+
+import static com.github.kaktushose.jda.commands.definitions.interactions.command.ParameterDefinition.TYPE_MAPPINGS;
 
 /// Collection of helper methods that are used inside the framework.
-///
-/// @since 4.0.0
 @ApiStatus.Internal
 public final class Helpers {
 
@@ -69,36 +70,33 @@ public static Optional<GuildChannel> resolveGuildChannel(@NotNull String raw, @N
     /// @return a possibly-empty set of all permissions
     @NotNull
     public static Set<String> permissions(@NotNull MethodBuildContext context) {
-        Permissions permission = context.method().getAnnotation(Permissions.class);
+        var permission = context.method().annotation(Permissions.class);
 
-        if (permission != null) {
+        if (permission.isPresent()) {
             HashSet<String> mergedPermissions = new HashSet<>(context.permissions());
-            mergedPermissions.addAll(Set.of(permission.value()));
+            mergedPermissions.addAll(Set.of(permission.get().value()));
             return Collections.unmodifiableSet(mergedPermissions);
         }
         return context.permissions();
     }
 
-    /// Constructs the [com.github.kaktushose.jda.commands.reflect.interactions.ReplyConfig ReplyConfig] based on the
-    /// passed [Method].
-    ///
-    /// This will first attempt to use the [ReplyConfig] annotation of the method and then of the class. If neither is
-    /// present will fall back to the
-    /// [com.github.kaktushose.jda.commands.dispatching.reply.GlobalReplyConfig GlobalReplyConfig].
+    /// Constructs the [InteractionDefinition.ReplyConfig ReplyConfig] based on the passed [Method].
     ///
     /// @param method the [Method] to use
-    /// @return the [com.github.kaktushose.jda.commands.reflect.interactions.ReplyConfig ReplyConfig]
+    /// @return the [InteractionDefinition.ReplyConfig ReplyConfig]
+    /// @implNote This will first attempt to use the [ReplyConfig] annotation of the method and then of the class.
+    /// If neither is present will fall back to the [GlobalReplyConfig].
     @NotNull
-    public static com.github.kaktushose.jda.commands.reflect.interactions.ReplyConfig replyConfig(@NotNull Method method) {
+    public static InteractionDefinition.ReplyConfig replyConfig(@NotNull Method method) {
         var global = method.getDeclaringClass().getAnnotation(ReplyConfig.class);
         var local = method.getAnnotation(ReplyConfig.class);
 
         if (global == null && local == null)
-            return new com.github.kaktushose.jda.commands.reflect.interactions.ReplyConfig();
+            return new InteractionDefinition.ReplyConfig();
         if (local == null)
-            return new com.github.kaktushose.jda.commands.reflect.interactions.ReplyConfig(global);
+            return new InteractionDefinition.ReplyConfig(global);
 
-        return new com.github.kaktushose.jda.commands.reflect.interactions.ReplyConfig(local);
+        return new InteractionDefinition.ReplyConfig(local);
     }
 
     /// Checks if the given parameter is present at the [Method] at the given index.
@@ -107,30 +105,28 @@ public static com.github.kaktushose.jda.commands.reflect.interactions.ReplyConfi
     /// @param index  the index the parameter is expected to be at
     /// @param type   the type of the parameter
     /// @return `true` if the parameter is present
-    public static boolean isIncorrectParameterType(@NotNull Method method, int index, @NotNull Class<?> type) {
-        if (!type.isAssignableFrom(method.getParameters()[index].getType())) {
+    public static boolean isIncorrectParameterType(@NotNull MethodDescription method, int index, @NotNull Class<?> type) {
+        if (!type.isAssignableFrom(List.copyOf(method.parameters()).get(index).type())) {
             log.error("An error has occurred! Skipping Interaction {}.{}:",
-                    method.getDeclaringClass().getSimpleName(),
-                    method.getName(),
+                    method.declaringClass().getName(),
+                    method.name(),
                     new IllegalArgumentException(String.format("%d. parameter must be of type %s", index + 1, type.getSimpleName())));
             return true;
         }
         return false;
     }
 
-    /// Checks if a [Method] has the given parameter count.
-    ///
-    /// @param count the parameter count
-    /// @return `true` if the method has the given parameter count
-    public static boolean isIncorrectParameterAmount(@NotNull Method method, int count) {
-        if (method.getParameters().length != count) {
+    public static boolean checkSignature(MethodDescription method, Collection<Class<?>> methodSignature) {
+        var parameters = method.parameters().stream()
+                .map(ParameterDescription::type)
+                .map(it -> TYPE_MAPPINGS.getOrDefault(it, it)).toList();
+        if (!parameters.equals(methodSignature)) {
             log.error("An error has occurred! Skipping Interaction {}.{}:",
-                    method.getDeclaringClass().getSimpleName(),
-                    method.getName(),
-                    new IllegalArgumentException(String.format(
-                            "Invalid amount of parameters!. Expected: %d Actual: %d",
-                            count,
-                            method.getParameters().length
+                    method.declaringClass().getName(),
+                    method.name(),
+                    new IllegalArgumentException("Incorrect method signature!\nExpected: %s\nActual:   %s".formatted(
+                            methodSignature.stream().toList(),
+                            method.parameters().stream().map(ParameterDescription::type).toList()
                     )));
             return true;
         }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/internal/JDAContext.java b/src/main/java/com/github/kaktushose/jda/commands/internal/JDAContext.java
index 145a57e7e..1faf5447f 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/internal/JDAContext.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/internal/JDAContext.java
@@ -6,34 +6,24 @@
 import net.dv8tion.jda.api.utils.cache.SnowflakeCacheView;
 import org.jetbrains.annotations.ApiStatus;
 
-import java.util.List;
 import java.util.function.Consumer;
 
-/**
- * Wrapper class for {@link JDA} and {@link ShardManager}. Use {@link #performTask(Consumer)} when you need to do
- * work with an {@link JDA} object.
- *
- * @since 2.3.0
- */
+/// Wrapper class for [JDA] and [ShardManager]. Use [#performTask(Consumer)] when you need to do work with an [JDA] object.
 @ApiStatus.Internal
 public final class JDAContext {
 
     private final Object context;
 
-    /**
-     * Constructs a new JDAContext.
-     *
-     * @param context the {@link JDA} or {@link ShardManager} object
-     */
+    /// Constructs a new JDAContext.
+    ///
+    /// @param context the [JDA] or [ShardManager] object
     public JDAContext(Object context) {
         this.context = context;
     }
 
-    /**
-     * Performs an operation on either the {@link JDA} object or on all shards.
-     *
-     * @param consumer the operation to perform
-     */
+    /// Performs an operation on either the [JDA] object or on all shards.
+    ///
+    /// @param consumer the operation to perform
     public void performTask(Consumer<JDA> consumer) {
         switch (context) {
             case ShardManager shardManager -> shardManager.getShardCache().forEach(consumer);
@@ -43,29 +33,9 @@ public void performTask(Consumer<JDA> consumer) {
         }
     }
 
-    /**
-     * An unmodifiable List of all {@link Guild Guilds} that the logged account is connected to.
-     * If this account is not connected to any {@link Guild Guilds}, this will return an empty list.
-     * This copies the backing store into a list. This means every call creates a new list with O(n) complexity.
-     * It is recommended to store this into a local variable or use getGuildCache() and use its more efficient
-     * versions of handling these values.
-     *
-     * @return Possibly-empty list of all the {@link Guild Guilds} that this account is connected to.
-     */
-    public List<Guild> getGuilds() {
-        return switch (context) {
-            case ShardManager shardManager -> shardManager.getGuilds();
-            case JDA jda -> jda.getGuilds();
-            default ->
-                    throw new IllegalArgumentException(String.format("Cannot cast %s", context.getClass().getSimpleName()));
-        };
-    }
-
-    /**
-     * {@link SnowflakeCacheView} of all cached {@link Guild Guilds}.
-     *
-     * @return {@link SnowflakeCacheView}
-     */
+    /// [SnowflakeCacheView] of all cached [Guild]s.
+    ///
+    /// @return [SnowflakeCacheView]
     public SnowflakeCacheView<Guild> getGuildCache() {
         return switch (context) {
             case ShardManager shardManager -> shardManager.getGuildCache();
diff --git a/src/main/java/com/github/kaktushose/jda/commands/internal/register/CommandTree.java b/src/main/java/com/github/kaktushose/jda/commands/internal/register/CommandTree.java
index cd492d494..b65b20be8 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/internal/register/CommandTree.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/internal/register/CommandTree.java
@@ -1,57 +1,46 @@
 package com.github.kaktushose.jda.commands.internal.register;
 
-import com.github.kaktushose.jda.commands.reflect.interactions.commands.SlashCommandDefinition;
+import com.github.kaktushose.jda.commands.definitions.interactions.command.SlashCommandDefinition;
 import net.dv8tion.jda.api.interactions.commands.build.SlashCommandData;
 import org.jetbrains.annotations.ApiStatus;
 
 import java.util.Collection;
 import java.util.List;
 
-/**
- * A tree data structure representing slash commands sorted into Subcommands and SubcommandGroups. Each {@link TreeNode}
- * can have <em>n</em> children, however the maximum level is <em>3</em> due to Discords limitations on SubcommandGroups.
- *
- * @see TreeNode
- * @see <a href="https://discord.com/developers/docs/interactions/application-commands#subcommands-and-subcommand-groups">Discord Subcommands and Subcommand Groups Documentation</a>
- * @since 2.3.0
- */
+/// A tree data structure representing slash commands sorted into Subcommands and SubcommandGroups. Each [TreeNode]
+/// can have _n_ children, however the maximum level is _3_ due to Discords limitations on SubcommandGroups.
+///
+/// @see TreeNode
+/// @see <a href="https://discord.com/developers/docs/interactions/application-commands#subcommands-and-subcommand-groups">Discord Subcommands and Subcommand Groups Documentation</a>
 @ApiStatus.Internal
 public record CommandTree(
         TreeNode root
 ) {
 
-    /**
-     * Constructs an empty CommandTree.
-     */
+    /// Constructs an empty CommandTree.
     public CommandTree() {
         this(new TreeNode());
     }
 
-    /**
-     * Constructs a new CommandTree.
-     */
+    /// Constructs a new CommandTree.
     public CommandTree(Collection<SlashCommandDefinition> commands) {
         this(new TreeNode());
         addAll(commands);
     }
 
-    /**
-     * Adds a {@link SlashCommandDefinition} to the {@link CommandTree}. The label of the {@link SlashCommandDefinition} will be
-     * sanitized to match the regex {@code ^[\w-]+$}. Furthermore, if the label consists of more than three spaces any
-     * additional space will be replaced with {@code _} due to Discords limitations on SubcommandGroups.
-     *
-     * @param command the {@link SlashCommandDefinition} to add
-     */
+    /// Adds a [SlashCommandDefinition] to the [CommandTree]. The label of the [SlashCommandDefinition] will be
+    /// sanitized to match the regex `^[\w-]+$`. Furthermore, if the label consists of more than three spaces any
+    /// additional space will be replaced with `_` due to Discords limitations on SubcommandGroups.
+    ///
+    /// @param command the [SlashCommandDefinition] to add
     public void add(SlashCommandDefinition command) {
-        root.addChild(resolveLabel(command.getName()), command);
+        root.addChild(resolveLabel(command.name()), command);
     }
 
-    /**
-     * Adds all {@link SlashCommandDefinition CommandDefinitions} of the {@link Collection} to the {@link CommandTree}.
-     *
-     * @param commands a {@link Collection} of {@link SlashCommandDefinition CommandDefinitions} to add
-     * @see #add(SlashCommandDefinition)
-     */
+    /// Adds all [SlashCommandDefinition]s of the [Collection] to the [CommandTree].
+    ///
+    /// @param commands a [Collection] of [SlashCommandDefinition]s to add
+    /// @see #add(SlashCommandDefinition)
     public void addAll(Collection<SlashCommandDefinition> commands) {
         commands.forEach(this::add);
     }
@@ -75,22 +64,18 @@ private String[] resolveLabel(String label) {
         return split;
     }
 
-    /**
-     * Gets all {@link SlashCommandData}.This will only return the {@link SlashCommandData} of the leaf nodes.
-     *
-     * @return a {@link List} of {@link SlashCommandData}
-     */
+    /// Gets all [SlashCommandData].This will only return the [SlashCommandData] of the leaf nodes.
+    ///
+    /// @return a [List] of [SlashCommandData]
     public List<SlashCommandData> getCommands() {
         return root.getCommandData();
     }
 
-    /**
-     * Gets the sanitized labels of all {@link SlashCommandData} returned by {@link #getCommands()}.
-     * The labels will match the regex {@code ^[\w-]+$}. Furthermore, if the label consists of more than three spaces
-     * any additional space will be replaced with {@code _} due to Discords limitations on SubcommandGroups.
-     *
-     * @return a {@link List} of labels
-     */
+    /// Gets the sanitized labels of all [SlashCommandData] returned by [#getCommands()].
+    /// The labels will match the regex `^[\w-]+$`. Furthermore, if the label consists of more than three spaces
+    /// any additional space will be replaced with `_` due to Discords limitations on SubcommandGroups.
+    ///
+    /// @return a [List] of labels
     public List<String> getNames() {
         return root.getNames();
     }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/internal/register/SlashCommandUpdater.java b/src/main/java/com/github/kaktushose/jda/commands/internal/register/SlashCommandUpdater.java
index 2efe3fc4b..6624cb637 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/internal/register/SlashCommandUpdater.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/internal/register/SlashCommandUpdater.java
@@ -1,13 +1,12 @@
 package com.github.kaktushose.jda.commands.internal.register;
 
-import com.github.kaktushose.jda.commands.annotations.interactions.SlashCommand;
+import com.github.kaktushose.jda.commands.annotations.interactions.CommandScope;
+import com.github.kaktushose.jda.commands.definitions.interactions.InteractionRegistry;
+import com.github.kaktushose.jda.commands.definitions.interactions.command.CommandDefinition;
+import com.github.kaktushose.jda.commands.definitions.interactions.command.ContextCommandDefinition;
+import com.github.kaktushose.jda.commands.definitions.interactions.command.SlashCommandDefinition;
 import com.github.kaktushose.jda.commands.internal.JDAContext;
-import com.github.kaktushose.jda.commands.reflect.InteractionRegistry;
-import com.github.kaktushose.jda.commands.reflect.interactions.commands.GenericCommandDefinition;
-import com.github.kaktushose.jda.commands.reflect.interactions.commands.SlashCommandDefinition;
 import com.github.kaktushose.jda.commands.scope.GuildScopeProvider;
-import net.dv8tion.jda.api.entities.Guild;
-import net.dv8tion.jda.api.interactions.commands.Command;
 import net.dv8tion.jda.api.interactions.commands.build.CommandData;
 import net.dv8tion.jda.api.interactions.commands.build.SlashCommandData;
 import org.jetbrains.annotations.ApiStatus;
@@ -17,110 +16,74 @@
 import java.util.*;
 import java.util.stream.Collectors;
 
-/**
- * Class that sends the {@link SlashCommandData} to Discord. Uses a {@link CommandTree} to properly transpile all
- * {@link SlashCommandDefinition CommandDefinitions} to {@link SlashCommandData}.
- *
- * @see CommandTree
- * @since 2.3.0
- */
+/// Class that sends the [CommandData] to Discord.
+///
+/// @implNote Uses a [CommandTree] to properly transpile all [SlashCommandDefinition]s to [SlashCommandData].
+/// @see CommandTree
 @ApiStatus.Internal
-public class SlashCommandUpdater {
+public final class SlashCommandUpdater {
 
     private static final Logger log = LoggerFactory.getLogger(SlashCommandUpdater.class);
     private final JDAContext jdaContext;
     private final GuildScopeProvider guildScopeProvider;
     private final InteractionRegistry interactionRegistry;
 
-    /**
-     * Constructs a new SlashCommandUpdater.
-     */
-    public SlashCommandUpdater(JDAContext jdaContext, GuildScopeProvider guildScopeProvider, InteractionRegistry interactionRegistry) {
+    /// Constructs a new SlashCommandUpdater.
+    public SlashCommandUpdater(JDAContext jdaContext, GuildScopeProvider guildScopeProvider, InteractionRegistry registry) {
         this.jdaContext = jdaContext;
         this.guildScopeProvider = guildScopeProvider;
-        this.interactionRegistry = interactionRegistry;
+        this.interactionRegistry = registry;
     }
 
-    /**
-     * Sends the {@link SlashCommandData} to Discord. This is equivalent to calling {@link #updateGlobalCommands()} and
-     * {@link #updateGuildCommands()} each.
-     */
+    /// Sends the [SlashCommandData] to Discord. This is equivalent to calling [#updateGlobalCommands()] and
+    /// [#updateGuildCommands()] each.
     public void updateAllCommands() {
         updateGuildCommands();
         updateGlobalCommands();
     }
 
-    /**
-     * Sends the guild scope {@link SlashCommandData} to Discord.
-     */
-    public void updateGuildCommands() {
-        log.debug("Updating guild commands...");
-        Map<Long, Set<CommandData>> guildMapping = getGuildMapping();
-        for (Guild guild : jdaContext.getGuildCache()) {
-            Set<CommandData> commands = guildMapping.getOrDefault(guild.getIdLong(), Collections.emptySet());
-            guild.updateCommands().addCommands(commands).queue();
-            log.debug(String.format("Registered guild command(s) %s for %s", commands.stream().map(CommandData::getName).collect(Collectors.toSet()), guild));
-        }
+    private Set<CommandData> getCommands(CommandScope scope) {
+        var tree = new CommandTree(
+                interactionRegistry.find(SlashCommandDefinition.class, it -> it.scope() == scope)
+        );
+        Set<CommandData> commands = new HashSet<>(tree.getCommands());
+        log.debug("Generated slash command tree with CommandScope.{}:\n{}", scope, tree);
+        commands.addAll(
+                interactionRegistry.find(ContextCommandDefinition.class, it -> it.scope() == scope)
+                        .stream()
+                        .map(ContextCommandDefinition::toJDAEntity)
+                        .toList()
+        );
+        return commands;
     }
 
-    /**
-     * Sends the global scope {@link SlashCommandData} to Discord.
-     */
+    /// Registers all [CommandDefinition]s with [CommandScope#GLOBAL].
     public void updateGlobalCommands() {
         log.debug("Updating global commands...");
+        var commands = getCommands(CommandScope.GLOBAL);
+        jdaContext.performTask(jda -> jda.updateCommands().addCommands(commands).queue());
+        log.debug("Registered global command(s): {}", commands.stream().map(CommandData::getName).collect(Collectors.toSet()));
+    }
 
-        Set<GenericCommandDefinition> globalCommands = interactionRegistry.getCommands()
-                .stream()
-                .filter(it -> it.getCommandScope() == SlashCommand.CommandScope.GLOBAL)
-                .collect(Collectors.toSet());
-
-        CommandTree tree = new CommandTree(
-                globalCommands.stream()
-                        .filter(it -> it.getCommandType() == Command.Type.SLASH)
-                        .map(it -> (SlashCommandDefinition) it)
-                        .collect(Collectors.toSet())
-        );
-        log.debug("Generated slash command tree with CommandScope.GLOBAL:\n" + tree);
-
-        Set<CommandData> result = new HashSet<>();
-        result.addAll(tree.getCommands());
-        result.addAll(globalCommands.stream().
-                filter(it -> (it.getCommandType() == Command.Type.USER || it.getCommandType() == Command.Type.MESSAGE))
-                .map(GenericCommandDefinition::toCommandData)
-                .collect(Collectors.toSet())
-        );
-        log.debug("Registered global command(s): " + result.stream().map(CommandData::getName).collect(Collectors.toSet()));
-
-        jdaContext.performTask(jda -> jda.updateCommands().addCommands(result).queue());
+    /// Sends the guild scope [SlashCommandData] to Discord.
+    public void updateGuildCommands() {
+        log.debug("Updating guild commands...");
+        var guildMapping = getGuildMapping();
+        for (var guild : jdaContext.getGuildCache()) {
+            var commands = guildMapping.getOrDefault(guild.getIdLong(), Collections.emptySet());
+            guild.updateCommands().addCommands(commands).queue();
+            log.debug("Registered guild command(s) {} for {}", commands.stream().map(CommandData::getName).collect(Collectors.toSet()), guild);
+        }
     }
 
     private Map<Long, Set<CommandData>> getGuildMapping() {
-        Set<GenericCommandDefinition> guildCommands = interactionRegistry.getCommands()
-                .stream()
-                .filter(it -> it.getCommandScope() == SlashCommand.CommandScope.GUILD)
-                .collect(Collectors.toSet());
-
-        CommandTree tree = new CommandTree(
-                guildCommands.stream()
-                        .filter(it -> it.getCommandType() == Command.Type.SLASH)
-                        .map(it -> (SlashCommandDefinition) it)
-                        .collect(Collectors.toSet())
-        );
-        log.debug("Generated slash command tree with CommandScope.GUILD:\n" + tree);
-
-        Set<CommandData> result = new HashSet<>();
-        result.addAll(tree.getCommands());
-        result.addAll(guildCommands.stream().
-                filter(it -> (it.getCommandType() == Command.Type.USER || it.getCommandType() == Command.Type.MESSAGE))
-                .map(GenericCommandDefinition::toCommandData)
-                .collect(Collectors.toSet())
-        );
-        log.debug("Interactions eligible for registration: " + result.stream().map(CommandData::getName).collect(Collectors.toSet()));
+        var commands = getCommands(CommandScope.GUILD);
+        log.debug("Interactions eligible for registration: {}", commands.stream().map(CommandData::getName).collect(Collectors.toSet()));
 
         Map<Long, Set<CommandData>> guildMapping = new HashMap<>();
-        for (CommandData command : result) {
+        for (var command : commands) {
             // create a copy so that a user doesn't modify the command data used for registration
-            Set<Long> guildIds = guildScopeProvider.apply(CommandData.fromData(command.toData()));
+            var guildIds = guildScopeProvider.apply(CommandData.fromData(command.toData()));
             if (guildIds.isEmpty()) {
                 log.debug("No guilds provided for command \"{}\"", command.getName());
             } else {
diff --git a/src/main/java/com/github/kaktushose/jda/commands/internal/register/TreeNode.java b/src/main/java/com/github/kaktushose/jda/commands/internal/register/TreeNode.java
index eae95bb9b..feddc13d2 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/internal/register/TreeNode.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/internal/register/TreeNode.java
@@ -1,6 +1,6 @@
 package com.github.kaktushose.jda.commands.internal.register;
 
-import com.github.kaktushose.jda.commands.reflect.interactions.commands.SlashCommandDefinition;
+import com.github.kaktushose.jda.commands.definitions.interactions.command.SlashCommandDefinition;
 import net.dv8tion.jda.api.Permission;
 import net.dv8tion.jda.api.interactions.commands.DefaultMemberPermissions;
 import net.dv8tion.jda.api.interactions.commands.build.Commands;
@@ -15,12 +15,9 @@
 
 import java.util.*;
 
-/**
- * Single node inside the {@link CommandTree}.
- *
- * @see CommandTree
- * @since 2.3.0
- */
+/// Single node inside the [CommandTree].
+///
+/// @see CommandTree
 @ApiStatus.Internal
 public record TreeNode(
         String name,
@@ -28,38 +25,32 @@ public record TreeNode(
         List<TreeNode> children
 ) implements Iterable<TreeNode> {
 
-    private static final Logger log = LoggerFactory.getLogger(SlashCommandUpdater.class);
+    private static final Logger log = LoggerFactory.getLogger(TreeNode.class);
 
-    /**
-     * Constructs an empty TreeNode. Should only be used for root nodes.
-     */
+    /// Constructs an empty TreeNode. Should only be used for root nodes.
     public TreeNode() {
         this("", null);
     }
 
-    /**
-     * Constructs a new TreeNode.
-     *
-     * @param name    the name of the command
-     * @param command the {@link SlashCommandDefinition}
-     */
+    /// Constructs a new TreeNode.
+    ///
+    /// @param name    the name of the command
+    /// @param command the [SlashCommandDefinition]
     public TreeNode(@NotNull String name, @Nullable SlashCommandDefinition command) {
         this(name, command, new ArrayList<>());
     }
 
-    /**
-     * Adds a child {@link TreeNode} either as a child of this {@link TreeNode} or to one of its children based on the
-     * amount of labels.
-     *
-     * <p>For instance {@code labels[0]} will be added as a child {@link TreeNode} to this
-     * {@link TreeNode}, {@code labels[1]} will be added as a child to the child {@link TreeNode} created from
-     * {@code labels[0]} and so on.
-     *
-     * <p>This guarantees to create a {@link CommandTree} that respects Subcommands and SubcommandGroups.
-     *
-     * @param labels  an Array of all labels, can be empty
-     * @param command the {@link SlashCommandDefinition} to add
-     */
+    /// Adds a child [TreeNode] either as a child of this [TreeNode] or to one of its children based on the
+    /// amount of labels.
+    ///
+    /// For instance `labels[0]` will be added as a child [TreeNode] to this
+    /// [TreeNode], `labels[1]` will be added as a child to the child [TreeNode] created from
+    /// `labels[0]` and so on.
+    ///
+    /// This guarantees to create a [CommandTree] that respects Subcommands and SubcommandGroups.
+    ///
+    /// @param labels  an Array of all labels, can be empty
+    /// @param command the [SlashCommandDefinition] to add
     public void addChild(@NotNull String[] labels, @NotNull SlashCommandDefinition command) {
         if (labels.length < 1) {
             return;
@@ -79,49 +70,39 @@ public void addChild(@NotNull String[] labels, @NotNull SlashCommandDefinition c
         }
     }
 
-    /**
-     * Gets a child {@link TreeNode} based on its name.
-     *
-     * @param name the label to get the child {@link TreeNode} from
-     * @return an {@link Optional} holding the result
-     */
+    /// Gets a child [TreeNode] based on its name.
+    ///
+    /// @param name the label to get the child [TreeNode] from
+    /// @return an [Optional] holding the result
     public Optional<TreeNode> getChild(String name) {
         return children.stream().filter(child -> child.name.equals(name)).findFirst();
     }
 
-    /**
-     * Gets the label of the {@link SlashCommandDefinition} of this {@link TreeNode}.
-     *
-     * @return the label of the {@link SlashCommandDefinition}
-     */
+    /// Gets the name of the [SlashCommandDefinition] of this [TreeNode].
+    ///
+    /// @return the name of the [SlashCommandDefinition]
     public String getName() {
         return name;
     }
 
-    /**
-     * Gets all children {@link TreeNode TreeNodes}.
-     *
-     * @return all children {@link TreeNode TreeNodes}
-     */
+    /// Gets all children [TreeNode]s.
+    ///
+    /// @return all children [TreeNode]s
     public List<TreeNode> getChildren() {
         return children;
     }
 
-    /**
-     * Gets whether this {@link TreeNode} has children.
-     *
-     * @return {@code true} if this {@link TreeNode} has children
-     */
+    /// Gets whether this [TreeNode] has children.
+    ///
+    /// @return `true` if this [TreeNode] has children
     public boolean hasChildren() {
         return !children.isEmpty();
     }
 
-    /**
-     * Gets the {@link SlashCommandDefinition} of this {@link TreeNode}. Returns an empty {@link Optional} if one or more
-     * children exist or if the {@link SlashCommandDefinition} is {@code null}.
-     *
-     * @return an {@link Optional} holding the result
-     */
+    /// Gets the [SlashCommandDefinition] of this [TreeNode]. Returns an empty [Optional] if one or more
+    /// children exist or if the [SlashCommandDefinition] is `null`.
+    ///
+    /// @return an [Optional] holding the result
     public Optional<SlashCommandDefinition> getCommand() {
         if (!children.isEmpty()) {
             return Optional.empty();
@@ -129,11 +110,9 @@ public Optional<SlashCommandDefinition> getCommand() {
         return Optional.ofNullable(command);
     }
 
-    /**
-     * Gets all names of the leaf nodes.
-     *
-     * @return a {@link List} of all names of the leaf nodes.
-     */
+    /// Gets all names of the leaf nodes.
+    ///
+    /// @return a [List] of all names of the leaf nodes.
     public List<String> getNames() {
         List<String> result = new ArrayList<>();
         toLabel(result, "");
@@ -148,11 +127,9 @@ private void toLabel(List<String> labels, String root) {
         }
     }
 
-    /**
-     * Gets all {@link SlashCommandData of the leaf nodes}.
-     *
-     * @return a {@link List} of all {@link SlashCommandData of the leaf nodes.
-     */
+    /// Gets all [of the leaf nodes][SlashCommandData].
+    ///
+    /// @return a [List] of [SlashCommandData]
     public List<SlashCommandData> getCommandData() {
         List<SlashCommandData> result = new ArrayList<>();
         children.forEach(child -> child.toCommandData(result));
@@ -170,27 +147,24 @@ private void toCommandData(Collection<SlashCommandData> commands) {
             return;
         }
         try {
-            commands.add(command.toCommandData());
+            commands.add(command.toJDAEntity());
         } catch (Exception e) {
-            log.error(String.format("Cannot convert command %s.%s to  SlashCommandData!",
-                    command.getMethod().getDeclaringClass().getSimpleName(),
-                    command.getMethod().getName()), e
-            );
+            log.error("Cannot convert command {}.{} to  SlashCommandData!", command.clazzDescription().name(), command.methodDescription().name(), e);
         }
     }
 
     private SlashCommandData createRootCommand(String name, List<TreeNode> children) {
         SlashCommandData result = Commands.slash(name, "empty description");
         List<SlashCommandDefinition> subCommands = unwrapDefinitions(children);
-        LocalizationFunction function = subCommands.getFirst().getLocalizationFunction();
+        LocalizationFunction function = subCommands.getFirst().localizationFunction();
 
         boolean isNSFW = false;
         boolean isGuildOnly = false;
         Set<Permission> enabledPermissions = new HashSet<>();
         for (SlashCommandDefinition command : subCommands) {
-            isNSFW = isNSFW || command.isNSFW();
-            isGuildOnly = isGuildOnly || command.isGuildOnly();
-            enabledPermissions.addAll(command.getEnabledPermissions());
+            isNSFW = isNSFW || command.nsfw();
+            isGuildOnly = isGuildOnly || command.guildOnly();
+            enabledPermissions.addAll(command.enabledPermissions());
         }
 
         return result.setDefaultPermissions(DefaultMemberPermissions.enabledFor(enabledPermissions))
diff --git a/src/main/java/com/github/kaktushose/jda/commands/package-info.java b/src/main/java/com/github/kaktushose/jda/commands/package-info.java
index ea309d268..0fca71228 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/package-info.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/package-info.java
@@ -1,4 +1,2 @@
-/**
- * Root package of JDA-Commands.
- */
+/// Root package of JDA-Commands.
 package com.github.kaktushose.jda.commands;
diff --git a/src/main/java/com/github/kaktushose/jda/commands/permissions/DefaultPermissionsProvider.java b/src/main/java/com/github/kaktushose/jda/commands/permissions/DefaultPermissionsProvider.java
index 45240803d..6ee9798fa 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/permissions/DefaultPermissionsProvider.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/permissions/DefaultPermissionsProvider.java
@@ -21,7 +21,6 @@
 ///
 ///
 /// @see PermissionsProvider
-/// @since 2.0.0
 public class DefaultPermissionsProvider implements PermissionsProvider {
 
     private static final Logger log = LoggerFactory.getLogger(DefaultPermissionsProvider.class);
@@ -40,7 +39,7 @@ public boolean hasPermission(@NotNull User user, @NotNull InvocationContext<?> c
     /// Any other permission String will be ignored.
     @Override
     public boolean hasPermission(@NotNull Member member, @NotNull InvocationContext<?> context) {
-        for (String s : context.definition().getPermissions()) {
+        for (String s : context.definition().permissions()) {
             // not a discord perm, continue
             if (Arrays.stream(Permission.values()).noneMatch(p -> p.name().equalsIgnoreCase(s))) {
                 continue;
diff --git a/src/main/java/com/github/kaktushose/jda/commands/permissions/PermissionsProvider.java b/src/main/java/com/github/kaktushose/jda/commands/permissions/PermissionsProvider.java
index 8a4f9ea44..5a83514f9 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/permissions/PermissionsProvider.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/permissions/PermissionsProvider.java
@@ -8,10 +8,9 @@
 
 /// Interface for performing permission checks.
 ///
-/// @see com.github.kaktushose.jda.commands.annotations.Implementation
+/// @see com.github.kaktushose.jda.commands.annotations.Implementation Implementation
 /// @see DefaultPermissionsProvider
 /// @see Permissions Permission
-/// @since 2.0.0
 public interface PermissionsProvider {
 
     /// Checks if a [User] has permissions. Compared to [#hasPermission(Member, InvocationContext)] this method will be
diff --git a/src/main/java/com/github/kaktushose/jda/commands/permissions/package-info.java b/src/main/java/com/github/kaktushose/jda/commands/permissions/package-info.java
index a73dd84ba..e93e8f9ca 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/permissions/package-info.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/permissions/package-info.java
@@ -1,4 +1,2 @@
-/**
- * Command permission system.
- */
+/// Command permission system.
 package com.github.kaktushose.jda.commands.permissions;
diff --git a/src/main/java/com/github/kaktushose/jda/commands/reflect/ConstraintDefinition.java b/src/main/java/com/github/kaktushose/jda/commands/reflect/ConstraintDefinition.java
deleted file mode 100644
index 91c63ed48..000000000
--- a/src/main/java/com/github/kaktushose/jda/commands/reflect/ConstraintDefinition.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.github.kaktushose.jda.commands.reflect;
-
-import com.github.kaktushose.jda.commands.dispatching.validation.Validator;
-
-/**
- * Representation of parameter constraint.
- *
- * @see com.github.kaktushose.jda.commands.annotations.constraints.Constraint Constraint
- * @see Validator
- * @since 2.0.0
- */
-public record ConstraintDefinition(Validator validator, String message, Object annotation) {
-}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/reflect/CooldownDefinition.java b/src/main/java/com/github/kaktushose/jda/commands/reflect/CooldownDefinition.java
deleted file mode 100644
index 646a5ea3d..000000000
--- a/src/main/java/com/github/kaktushose/jda/commands/reflect/CooldownDefinition.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.github.kaktushose.jda.commands.reflect;
-
-import com.github.kaktushose.jda.commands.annotations.interactions.Cooldown;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.concurrent.TimeUnit;
-
-/**
- * Representation of a command cooldown.
- *
- * @see Cooldown
- * @since 2.0.0
- */
-public record CooldownDefinition(
-        long delay,
-        TimeUnit timeUnit
-) {
-    /**
-     * Builds a new CooldownDefinition.
-     *
-     * @param cooldown an instance of the corresponding {@link Cooldown} annotation
-     * @return a new CooldownDefinition
-     */
-    @NotNull
-    public static CooldownDefinition build(@Nullable Cooldown cooldown) {
-        if (cooldown == null) {
-            return new CooldownDefinition(0, TimeUnit.MILLISECONDS);
-        }
-        return new CooldownDefinition(cooldown.value(), cooldown.timeUnit());
-    }
-}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/reflect/InteractionControllerDefinition.java b/src/main/java/com/github/kaktushose/jda/commands/reflect/InteractionControllerDefinition.java
deleted file mode 100644
index 9f04d4f6b..000000000
--- a/src/main/java/com/github/kaktushose/jda/commands/reflect/InteractionControllerDefinition.java
+++ /dev/null
@@ -1,152 +0,0 @@
-package com.github.kaktushose.jda.commands.reflect;
-
-import com.github.kaktushose.jda.commands.annotations.Inject;
-import com.github.kaktushose.jda.commands.annotations.interactions.*;
-import com.github.kaktushose.jda.commands.dependency.DependencyInjector;
-import com.github.kaktushose.jda.commands.dispatching.validation.ValidatorRegistry;
-import com.github.kaktushose.jda.commands.reflect.interactions.AutoCompleteDefinition;
-import com.github.kaktushose.jda.commands.reflect.interactions.GenericInteractionDefinition;
-import com.github.kaktushose.jda.commands.reflect.interactions.ModalDefinition;
-import com.github.kaktushose.jda.commands.reflect.interactions.commands.ContextCommandDefinition;
-import com.github.kaktushose.jda.commands.reflect.interactions.commands.SlashCommandDefinition;
-import com.github.kaktushose.jda.commands.reflect.interactions.components.ButtonDefinition;
-import com.github.kaktushose.jda.commands.reflect.interactions.components.menus.EntitySelectMenuDefinition;
-import com.github.kaktushose.jda.commands.reflect.interactions.components.menus.StringSelectMenuDefinition;
-import net.dv8tion.jda.api.interactions.commands.localization.LocalizationFunction;
-import org.jetbrains.annotations.NotNull;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.Optional;
-import java.util.*;
-
-/**
- * Representation of an interaction controller.
- *
- * @since 2.0.0
- */
-public record InteractionControllerDefinition(
-        Set<GenericInteractionDefinition> definitions
-) {
-
-    private static final Logger log = LoggerFactory.getLogger(InteractionControllerDefinition.class);
-
-    /**
-     * Builds a new ControllerDefinition.
-     *
-     * @param interactionClass     the {@link Class} of the controller
-     * @param validatorRegistry    the corresponding {@link ValidatorRegistry}
-     * @param dependencyInjector   the corresponding {@link DependencyInjector}
-     * @param localizationFunction the {@link LocalizationFunction} to use
-     * @return an {@link Optional} holding the ControllerDefinition
-     */
-    public static InteractionControllerDefinition build(@NotNull Class<?> interactionClass,
-                                                        @NotNull ValidatorRegistry validatorRegistry,
-                                                        @NotNull DependencyInjector dependencyInjector,
-                                                        @NotNull LocalizationFunction localizationFunction) {
-        Interaction interaction = interactionClass.getAnnotation(Interaction.class);
-
-        List<Field> fields = Arrays.stream(interactionClass.getDeclaredFields())
-                .filter(field -> field.isAnnotationPresent(Inject.class))
-                .toList();
-        dependencyInjector.registerDependencies(interactionClass, fields);
-
-        Permissions permission = interactionClass.getAnnotation(Permissions.class);
-        final Set<String> permissions = permission != null
-                ? Set.of(permission.value())
-                : Set.of();
-
-        // get controller level cooldown and use it if no command level cooldown is present
-        Cooldown cooldownAnn = interactionClass.getAnnotation(Cooldown.class);
-        CooldownDefinition cooldown = cooldownAnn != null
-                ? CooldownDefinition.build(cooldownAnn)
-                : null;
-
-
-        Collection<AutoCompleteDefinition> autoCompleteDefinitions = autoCompleteDefinitions(interactionClass);
-
-        // index interactions
-        Set<GenericInteractionDefinition> interactionDefinitions = interactionDefinitions(
-                interactionClass,
-                validatorRegistry,
-                localizationFunction,
-                interaction,
-                permissions,
-                cooldown,
-                autoCompleteDefinitions
-        );
-
-        // validate auto completes
-        List<SlashCommandDefinition> commandDefinitions = interactionDefinitions.stream()
-                .filter(SlashCommandDefinition.class::isInstance)
-                .map(SlashCommandDefinition.class::cast)
-                .toList();
-
-        autoCompleteDefinitions.stream()
-                .map(AutoCompleteDefinition::getCommandNames)
-                .flatMap(Collection::stream)
-                .filter(name -> commandDefinitions.stream().noneMatch(command -> command.getName().startsWith(name)))
-                .forEach(s -> log.warn("No Command found for auto complete {}", s));
-
-        return new InteractionControllerDefinition(interactionDefinitions);
-    }
-
-    private static Collection<AutoCompleteDefinition> autoCompleteDefinitions(Class<?> interactionClass) {
-        return Arrays.stream(interactionClass.getDeclaredMethods())
-                .filter(method -> method.isAnnotationPresent(AutoComplete.class))
-                .map(AutoCompleteDefinition::build)
-                .flatMap(Optional::stream)
-                .toList();
-    }
-
-    private static Set<GenericInteractionDefinition> interactionDefinitions(Class<?> clazz,
-                                                                            ValidatorRegistry validatorRegistry,
-                                                                            LocalizationFunction localizationFunction,
-                                                                            Interaction interaction,
-                                                                            Set<String> permissions,
-                                                                            CooldownDefinition cooldown,
-                                                                            Collection<AutoCompleteDefinition> autocompletes) {
-        Set<GenericInteractionDefinition> definitions = new HashSet<>(autocompletes);
-        for (Method method : clazz.getDeclaredMethods()) {
-            final MethodBuildContext context = new MethodBuildContext(
-                    validatorRegistry,
-                    localizationFunction,
-                    interaction,
-                    permissions,
-                    cooldown,
-                    method,
-                    autocompletes
-            );
-
-            Optional<? extends GenericInteractionDefinition> definition = Optional.empty();
-            // index commands
-            if (method.isAnnotationPresent(SlashCommand.class)) {
-                definition = SlashCommandDefinition.build(context);
-            }
-            if (method.isAnnotationPresent(ContextCommand.class)) {
-                definition = ContextCommandDefinition.build(context);
-            }
-
-            // index components
-            if (method.isAnnotationPresent(Button.class)) {
-                definition = ButtonDefinition.build(context);
-            }
-            if (method.isAnnotationPresent(EntitySelectMenu.class)) {
-                definition = EntitySelectMenuDefinition.build(context);
-            }
-            if (method.isAnnotationPresent(StringSelectMenu.class)) {
-                definition = StringSelectMenuDefinition.build(context);
-            }
-
-            //index modals
-            if (method.isAnnotationPresent(Modal.class)) {
-                definition = ModalDefinition.build(method);
-            }
-
-            definition.ifPresent(definitions::add);
-        }
-        return definitions;
-    }
-}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/reflect/InteractionRegistry.java b/src/main/java/com/github/kaktushose/jda/commands/reflect/InteractionRegistry.java
deleted file mode 100644
index aabad13a8..000000000
--- a/src/main/java/com/github/kaktushose/jda/commands/reflect/InteractionRegistry.java
+++ /dev/null
@@ -1,184 +0,0 @@
-package com.github.kaktushose.jda.commands.reflect;
-
-import com.github.kaktushose.jda.commands.annotations.interactions.Interaction;
-import com.github.kaktushose.jda.commands.dependency.DependencyInjector;
-import com.github.kaktushose.jda.commands.dispatching.validation.ValidatorRegistry;
-import com.github.kaktushose.jda.commands.reflect.interactions.AutoCompleteDefinition;
-import com.github.kaktushose.jda.commands.reflect.interactions.GenericInteractionDefinition;
-import com.github.kaktushose.jda.commands.reflect.interactions.ModalDefinition;
-import com.github.kaktushose.jda.commands.reflect.interactions.commands.GenericCommandDefinition;
-import com.github.kaktushose.jda.commands.reflect.interactions.commands.SlashCommandDefinition;
-import com.github.kaktushose.jda.commands.reflect.interactions.components.ButtonDefinition;
-import com.github.kaktushose.jda.commands.reflect.interactions.components.menus.GenericSelectMenuDefinition;
-import net.dv8tion.jda.api.interactions.commands.localization.LocalizationFunction;
-import net.dv8tion.jda.api.interactions.components.selections.SelectMenu;
-import org.jetbrains.annotations.NotNull;
-import org.reflections.Reflections;
-import org.reflections.scanners.Scanners;
-import org.reflections.util.ClasspathHelper;
-import org.reflections.util.ConfigurationBuilder;
-import org.reflections.util.FilterBuilder;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.function.Predicate;
-
-/**
- * Central registry for all {@link SlashCommandDefinition CommandDefinitions}.
- *
- * @since 2.0.0
- */
-public final class InteractionRegistry {
-
-    private final static Logger log = LoggerFactory.getLogger(InteractionRegistry.class);
-    private final ValidatorRegistry validatorRegistry;
-    private final DependencyInjector dependencyInjector;
-    private final LocalizationFunction localizationFunction;
-    private final Set<GenericInteractionDefinition> definitions = new HashSet<>();
-
-    /**
-     * Constructs a new CommandRegistry.
-     *
-     * @param validatorRegistry    the corresponding {@link ValidatorRegistry}
-     * @param dependencyInjector   the corresponding {@link DependencyInjector}
-     * @param localizationFunction the {@link LocalizationFunction} to use
-     */
-    public InteractionRegistry(@NotNull ValidatorRegistry validatorRegistry,
-                               @NotNull DependencyInjector dependencyInjector,
-                               @NotNull LocalizationFunction localizationFunction) {
-        this.validatorRegistry = validatorRegistry;
-        this.dependencyInjector = dependencyInjector;
-        this.localizationFunction = localizationFunction;
-    }
-
-    /**
-     * Scans the whole classpath for commands.
-     *
-     * @param packages package(s) to exclusively scan
-     * @param clazz    a class of the classpath to scan
-     */
-    public void index(@NotNull Class<?> clazz, @NotNull String... packages) {
-        log.debug("Indexing controllers...");
-
-        FilterBuilder filter = new FilterBuilder();
-        for (String pkg : packages) {
-            filter.includePackage(pkg);
-        }
-
-        ConfigurationBuilder config = new ConfigurationBuilder()
-                .setScanners(Scanners.SubTypes, Scanners.TypesAnnotated)
-                .setUrls(ClasspathHelper.forClass(clazz))
-                .filterInputsBy(filter);
-        Reflections reflections = new Reflections(config);
-
-        Set<Class<?>> controllerSet = reflections.getTypesAnnotatedWith(Interaction.class);
-
-        for (Class<?> aClass : controllerSet) {
-            log.debug("Found interaction controller {}", aClass.getName());
-
-            InteractionControllerDefinition controller = InteractionControllerDefinition.build(
-                    aClass,
-                    validatorRegistry,
-                    dependencyInjector,
-                    localizationFunction
-            );
-
-            definitions.addAll(controller.definitions());
-            log.debug("Registered interaction controller {}", controller);
-        }
-
-        log.debug("Successfully registered {} interaction controller(s) with a total of {} interaction(s)!",
-                controllerSet.size(),
-                definitions.size());
-    }
-
-    /**
-     * Attempts to find a {@link GenericInteractionDefinition} of type {@link T} based on the given {@link Predicate}.
-     *
-     * @param type          the type of the {@link GenericInteractionDefinition} to find
-     * @param internalError {@code true} if the {@link GenericInteractionDefinition} must be found and not finding it
-     *                      indicates a framework bug
-     * @param predicate     the {@link Predicate} used to find the {@link GenericInteractionDefinition}
-     * @param <T>           a subtype of {@link GenericInteractionDefinition}
-     * @return {@link T}
-     * @throws IllegalStateException    if no {@link GenericInteractionDefinition} was found, although this mandatory
-     *                                  should have been the case. This is a rare occasion and can be considered a
-     *                                  framework bug
-     * @throws IllegalArgumentException if no {@link GenericInteractionDefinition} was found, because the
-     *                                  {@link Predicate} didn't include any elements
-     */
-    public <T extends GenericInteractionDefinition> T find(Class<T> type, boolean internalError, Predicate<T> predicate) {
-        return definitions.stream()
-                .filter(type::isInstance)
-                .map(type::cast)
-                .filter(predicate)
-                .findFirst()
-                .orElseThrow(() -> internalError
-                        ? new IllegalStateException("No interaction found! Please report this error the the devs of jda-commands.")
-                        : new IllegalArgumentException("No interaction found! Please check that the referenced interaction method exists.")
-                );
-    }
-
-    /**
-     * Gets a possibly-empty list of all {@link GenericCommandDefinition CommandDefinitions}.
-     *
-     * @return a possibly-empty list of all {@link GenericCommandDefinition CommandDefinitions}
-     */
-    public Collection<GenericCommandDefinition> getCommands() {
-        return definitions.stream()
-                .filter(GenericCommandDefinition.class::isInstance)
-                .map(GenericCommandDefinition.class::cast)
-                .toList();
-    }
-
-    /**
-     * Gets a possibly-empty list of all buttonContainers.
-     *
-     * @return a possibly-empty list of all buttonContainers
-     */
-    public Collection<ButtonDefinition> getButtons() {
-        return definitions.stream()
-                .filter(ButtonDefinition.class::isInstance)
-                .map(ButtonDefinition.class::cast)
-                .toList();
-    }
-
-    /**
-     * Gets a possibly-empty list of all select menus.
-     *
-     * @return a possibly-empty list of all select menus
-     */
-    public Collection<GenericSelectMenuDefinition<? extends SelectMenu>> getSelectMenus() {
-        return definitions.stream()
-                .filter(GenericSelectMenuDefinition.class::isInstance)
-                .<GenericSelectMenuDefinition<? extends SelectMenu>>map(GenericSelectMenuDefinition.class::cast)
-                .toList();
-    }
-
-    /**
-     * Gets a possibly-empty list of all {@link AutoCompleteDefinition AutoCompleteDefinitions}.
-     *
-     * @return a possibly-empty list of all {@link AutoCompleteDefinition AutoCompleteDefinitions}
-     */
-    public Collection<AutoCompleteDefinition> getAutoCompletes() {
-        return definitions.stream()
-                .filter(AutoCompleteDefinition.class::isInstance)
-                .map(AutoCompleteDefinition.class::cast)
-                .toList();
-    }
-
-    /**
-     * Gets a possibly-empty list of all {@link ModalDefinition ModalDefinitions}.
-     *
-     * @return a possibly-empty list of all {@link ModalDefinition ModalDefinitions}
-     */
-    public Collection<ModalDefinition> getModals() {
-        return definitions.stream()
-                .filter(ModalDefinition.class::isInstance)
-                .map(ModalDefinition.class::cast)
-                .toList();
-    }
-}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/reflect/MethodBuildContext.java b/src/main/java/com/github/kaktushose/jda/commands/reflect/MethodBuildContext.java
deleted file mode 100644
index f92c549bd..000000000
--- a/src/main/java/com/github/kaktushose/jda/commands/reflect/MethodBuildContext.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.github.kaktushose.jda.commands.reflect;
-
-import com.github.kaktushose.jda.commands.annotations.interactions.Interaction;
-import com.github.kaktushose.jda.commands.dispatching.validation.ValidatorRegistry;
-import com.github.kaktushose.jda.commands.reflect.interactions.AutoCompleteDefinition;
-import com.github.kaktushose.jda.commands.reflect.interactions.GenericInteractionDefinition;
-import net.dv8tion.jda.api.interactions.commands.localization.LocalizationFunction;
-import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.NotNull;
-
-import java.lang.reflect.Method;
-import java.util.Collection;
-import java.util.Set;
-
-/// Holds all objects needed to create a [GenericInteractionDefinition].
-@ApiStatus.Internal
-public record MethodBuildContext(
-        @NotNull ValidatorRegistry validatorRegistry,
-        @NotNull LocalizationFunction localizationFunction,
-        Interaction interaction,
-        Set<String> permissions,
-        CooldownDefinition cooldownDefinition,
-        Method method,
-        Collection<AutoCompleteDefinition> autoCompleteDefinitions
-) {
-}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/reflect/TextInputDefinition.java b/src/main/java/com/github/kaktushose/jda/commands/reflect/TextInputDefinition.java
deleted file mode 100644
index d3260b7dd..000000000
--- a/src/main/java/com/github/kaktushose/jda/commands/reflect/TextInputDefinition.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package com.github.kaktushose.jda.commands.reflect;
-
-import com.github.kaktushose.jda.commands.annotations.interactions.TextInput;
-import net.dv8tion.jda.api.interactions.components.text.TextInput.Builder;
-import net.dv8tion.jda.api.interactions.components.text.TextInputStyle;
-import org.jetbrains.annotations.NotNull;
-
-import java.lang.reflect.Parameter;
-import java.util.Optional;
-
-/**
- * Representation of a {@link TextInput} of a
- * {@link com.github.kaktushose.jda.commands.annotations.interactions.Modal Modal}.
- *
- * @see TextInput
- * @see com.github.kaktushose.jda.commands.annotations.interactions.Modal Modal
- * @since 4.0.0
- */
-public record TextInputDefinition(
-        String label,
-        String placeholder,
-        String defaultValue,
-        int minValue,
-        int maxValue,
-        TextInputStyle style,
-        boolean required
-) {
-
-    /**
-     * Builds a new TextInputDefinition.
-     *
-     * @param parameter the {@link Parameter} of the text input
-     * @return an {@link Optional} holding the TextInputDefinition
-     */
-    public static Optional<TextInputDefinition> build(@NotNull Parameter parameter) {
-        if (!parameter.isAnnotationPresent(TextInput.class)) {
-            return Optional.empty();
-        }
-
-        // TODO for now we only allow Strings, maybe add type adapting in the future
-        if (!String.class.isAssignableFrom(parameter.getType())) {
-            return Optional.empty();
-        }
-
-        TextInput textInput = parameter.getAnnotation(TextInput.class);
-
-        return Optional.of(new TextInputDefinition(
-                textInput.label().isEmpty() ? parameter.getName() : textInput.label(),
-                textInput.value(),
-                textInput.defaultValue(),
-                textInput.minValue(),
-                textInput.maxValue(),
-                textInput.style(),
-                textInput.required()
-        ));
-    }
-
-    /**
-     * Transforms this TextInputDefinition to a {@link net.dv8tion.jda.api.interactions.components.text.TextInput TextInput}.
-     *
-     * @return the transformed {@link net.dv8tion.jda.api.interactions.components.text.TextInput TextInput}
-     */
-    public net.dv8tion.jda.api.interactions.components.text.TextInput toTextInput() {
-        Builder textInput = net.dv8tion.jda.api.interactions.components.text.TextInput.create(label, label, style).setRequired(required);
-
-        if (minValue != -1) {
-            textInput.setMinLength(minValue);
-        }
-        if (maxValue != -1) {
-            textInput.setMaxLength(maxValue);
-        }
-        if (!placeholder.isBlank()) {
-            textInput.setPlaceholder(placeholder);
-        }
-        if (!defaultValue.isBlank()) {
-            textInput.setValue(defaultValue);
-        }
-
-        return textInput.build();
-    }
-}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/AutoCompleteDefinition.java b/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/AutoCompleteDefinition.java
deleted file mode 100644
index a994f97fa..000000000
--- a/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/AutoCompleteDefinition.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package com.github.kaktushose.jda.commands.reflect.interactions;
-
-import com.github.kaktushose.jda.commands.internal.Helpers;
-import com.github.kaktushose.jda.commands.annotations.interactions.AutoComplete;
-import com.github.kaktushose.jda.commands.annotations.interactions.Interaction;
-import com.github.kaktushose.jda.commands.dispatching.events.interactions.AutoCompleteEvent;
-import org.jetbrains.annotations.NotNull;
-
-import java.lang.reflect.Method;
-import java.util.HashSet;
-import java.util.Optional;
-import java.util.Set;
-
-/**
- * Representation of an AutoComplete.
- *
- * @see AutoComplete
- * @since 4.0.0
- */
-public final class AutoCompleteDefinition extends GenericInteractionDefinition {
-
-    private final Set<String> commands;
-
-    private AutoCompleteDefinition(Method method, Set<String> commands) {
-        super(method, new HashSet<>());
-        this.commands = commands;
-    }
-
-    /**
-     * Builds a new AutoCompleteDefinition.
-     *
-     * @param method the {@link Method} of the AutoComplete
-     * @return an {@link Optional} holding the AutoCompleteDefinition
-     */
-    public static Optional<AutoCompleteDefinition> build(@NotNull Method method) {
-        if (!method.isAnnotationPresent(AutoComplete.class) || !method.getDeclaringClass().isAnnotationPresent(Interaction.class)) {
-            return Optional.empty();
-        }
-
-        if (Helpers.isIncorrectParameterAmount(method, 1)) {
-            return Optional.empty();
-        }
-
-        if (Helpers.isIncorrectParameterType(method, 0, AutoCompleteEvent.class)) {
-            return Optional.empty();
-        }
-
-        AutoComplete autoComplete = method.getAnnotation(AutoComplete.class);
-        Set<String> values = Set.of(autoComplete.value());
-
-        return Optional.of(new AutoCompleteDefinition(method, values));
-    }
-
-    /**
-     * Gets a set of names of all the commands this AutoComplete can handle
-     *
-     * @return a set of command names
-     */
-    public Set<String> getCommandNames() {
-        return commands;
-    }
-
-    @Override
-    public String toString() {
-        return "AutoCompleteDefinition{" +
-                "commands=" + commands +
-                ", id='" + definitionId + "'" +
-                ", method=" + method +
-                '}';
-    }
-}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/CustomId.java b/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/CustomId.java
deleted file mode 100644
index eb4e0dfb5..000000000
--- a/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/CustomId.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package com.github.kaktushose.jda.commands.reflect.interactions;
-
-import com.github.kaktushose.jda.commands.dispatching.internal.Runtime;
-import com.github.kaktushose.jda.commands.reflect.interactions.components.GenericComponentDefinition;
-import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.NotNull;
-
-/// Indicates that this class can create a component or modal which Discord requires a custom id for.
-///
-/// @implSpec the custom id has the following structure: `[prefix.runtimeId.definitionId]`. The prefix will always be `jdac`,
-/// indicating that this id was created by jda-commands. The runtime id is a UUID or the String literal `independent`,
-/// if the component or modal works runtime independent. The definition id is the hash value of the full class name and
-/// method name combined: `(method.getDeclaringClass.getName() + method.getName()).hash()`
-/// @see GenericComponentDefinition
-/// @see ModalDefinition
-/// @since 4.0.0
-@ApiStatus.Internal
-public sealed interface CustomId permits GenericComponentDefinition, ModalDefinition {
-
-    String PREFIX = "jdac";
-    String BOUND_CUSTOM_ID_REGEX = "^jdac\\.[0-9a-fA-F-]{36}\\.-?\\d+$";
-    String INDEPENDENT_CUSTOM_ID_REGEX = "^jdac\\.independent\\.-?\\d+$";
-
-    /// Extracts the runtime id from the passed custom id.
-    ///
-    /// @param customId the custom id to extract the runtime id from
-    /// @return the runtime id
-    @NotNull
-    static String runtimeId(@NotNull String customId) {
-        if (isIndependent(customId)) {
-            throw new IllegalArgumentException("Provided custom id is independent!");
-        }
-        return getId(customId, 1);
-    }
-
-    /// Extracts the definition id from the passed custom id.
-    ///
-    /// @param customId the definition id to extract the runtime id from
-    /// @return the runtime id
-    /// @throws IllegalArgumentException if the passed custom id is a runtime-independent id
-    @NotNull
-    static String definitionId(@NotNull String customId) {
-        return getId(customId, 2);
-    }
-
-    /// Checks if the passed custom id is runtime-independent.
-    ///
-    /// @param customId the custom id to check
-    /// @return `true` if the custom id is runtime-independent
-    static boolean isIndependent(@NotNull String customId) {
-        return customId.matches(INDEPENDENT_CUSTOM_ID_REGEX);
-    }
-
-    /// Checks if the passed custom id is runtime-bound.
-    ///
-    /// @param customId the custom id to check
-    /// @return `true` if the custom id is runtime-bound
-    static boolean isBound(@NotNull String customId) {
-        return customId.matches(BOUND_CUSTOM_ID_REGEX);
-    }
-
-    /// Checks if the passed custom id conforms to the defined format of jda-commands.
-    ///
-    /// @param customId the custom id to check
-    /// @return `true` if the passed custom id conforms to the jda-commands format
-    static boolean isInvalid(@NotNull String customId) {
-        return !(isIndependent(customId) || isBound(customId));
-    }
-
-    private static String getId(String customId, int index) {
-        if (isInvalid(customId)) {
-            throw new IllegalArgumentException("Illegal id format!");
-        }
-        return customId.split("\\.")[index];
-    }
-
-    /// Gets a custom id for this definition that is bound to the passed [Runtime] id.
-    ///
-    /// @param runtimeId the id of the [Runtime]
-    /// @return the custom id
-    @NotNull
-    String boundCustomId(@NotNull String runtimeId);
-
-    /// Gets a custom id for this definition that is runtime-independent.
-    ///
-    /// @return the custom id
-    /// @throws UnsupportedOperationException if the interaction this definition wraps doesn't support independent execution
-    @NotNull
-    String independentCustomId();
-}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/EphemeralInteractionDefinition.java b/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/EphemeralInteractionDefinition.java
deleted file mode 100644
index 0106211b2..000000000
--- a/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/EphemeralInteractionDefinition.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.github.kaktushose.jda.commands.reflect.interactions;
-
-import com.github.kaktushose.jda.commands.reflect.interactions.commands.GenericCommandDefinition;
-import com.github.kaktushose.jda.commands.reflect.interactions.components.GenericComponentDefinition;
-
-import java.lang.reflect.Method;
-import java.util.Set;
-
-/**
- * Represents interactions that can be replied to with an ephemeral text message.
- *
- * @since 4.0.0
- */
-public abstract sealed class EphemeralInteractionDefinition extends GenericInteractionDefinition permits ModalDefinition, GenericCommandDefinition, GenericComponentDefinition {
-
-    protected final ReplyConfig replyConfig;
-
-    protected EphemeralInteractionDefinition(Method method, Set<String> permissions, ReplyConfig replyConfig) {
-        super(method, permissions);
-        this.replyConfig = replyConfig;
-    }
-
-    /**
-     * Gets whether replies should be ephemeral.
-     *
-     * @return {@code true} if replies should be ephemeral
-     */
-    public ReplyConfig replyConfig() {
-        return replyConfig;
-    }
-
-}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/GenericInteractionDefinition.java b/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/GenericInteractionDefinition.java
deleted file mode 100644
index b97dc5805..000000000
--- a/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/GenericInteractionDefinition.java
+++ /dev/null
@@ -1,89 +0,0 @@
-package com.github.kaktushose.jda.commands.reflect.interactions;
-
-import com.github.kaktushose.jda.commands.dispatching.context.InvocationContext;
-import org.jetbrains.annotations.NotNull;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.SequencedCollection;
-import java.util.Set;
-
-/**
- * Abstract base class for all interaction definitions.
- *
- * @since 4.0.0
- */
-public sealed abstract class GenericInteractionDefinition permits AutoCompleteDefinition, EphemeralInteractionDefinition {
-
-    protected static final Logger log = LoggerFactory.getLogger(GenericInteractionDefinition.class);
-
-    protected final String definitionId;
-    protected final Method method;
-    protected final Set<String> permissions;
-
-    protected GenericInteractionDefinition(Method method, Set<String> permissions) {
-        this.definitionId = String.valueOf((method.getDeclaringClass().getName() + method.getName()).hashCode());
-        this.method = method;
-        this.permissions = permissions;
-    }
-
-    public final void invoke(Object instance, InvocationContext<?> invocation) throws InvocationTargetException, IllegalAccessException {
-        SequencedCollection<Object> arguments = invocation.arguments();
-
-        method.invoke(instance, arguments.toArray());
-    }
-
-    /**
-     * Returns the id of the interaction definition.
-     *
-     * @return the id of the interaction definition
-     */
-    @NotNull
-    public String getDefinitionId() {
-        return definitionId;
-    }
-
-    /**
-     * Gets the {@link Method} of the interaction.
-     *
-     * @return the {@link Method} of the interaction
-     */
-    @NotNull
-    public Method getMethod() {
-        return method;
-    }
-
-    /**
-     * Gets a set of permission Strings.
-     *
-     * @return set of permission Strings
-     */
-    public Set<String> getPermissions() {
-        return permissions;
-    }
-
-    /**
-     * Returns the display name of this interaction. By default, returns the method name
-     *
-     * @return the name of this interaction
-     */
-    public String getDisplayName() {
-        return method.getName();
-    }
-
-    /**
-     * Gets a new instance of the method defining class
-     *
-     * @return a new instance of the method defining class
-     * @throws InvocationTargetException if the underlying constructor throws an exception
-     * @throws InstantiationException    if the class that declares the underlying constructor represents an abstract class
-     * @throws IllegalAccessException    if this Constructor object is enforcing Java language access control and
-     *                                   the underlying constructor is inaccessible
-     */
-    @NotNull
-    public Object newInstance() throws InvocationTargetException, InstantiationException, IllegalAccessException {
-        return method.getDeclaringClass().getConstructors()[0].newInstance();
-    }
-}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/ModalDefinition.java b/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/ModalDefinition.java
deleted file mode 100644
index 9ffb95824..000000000
--- a/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/ModalDefinition.java
+++ /dev/null
@@ -1,143 +0,0 @@
-package com.github.kaktushose.jda.commands.reflect.interactions;
-
-import com.github.kaktushose.jda.commands.internal.Helpers;
-import com.github.kaktushose.jda.commands.annotations.interactions.Interaction;
-import com.github.kaktushose.jda.commands.annotations.interactions.Modal;
-import com.github.kaktushose.jda.commands.annotations.interactions.Permissions;
-import com.github.kaktushose.jda.commands.dispatching.events.interactions.ModalEvent;
-import com.github.kaktushose.jda.commands.dispatching.internal.Runtime;
-import com.github.kaktushose.jda.commands.reflect.TextInputDefinition;
-import net.dv8tion.jda.api.interactions.modals.Modal.Builder;
-import org.jetbrains.annotations.NotNull;
-
-import java.lang.reflect.Method;
-import java.lang.reflect.Parameter;
-import java.util.*;
-
-/**
- * Representation of a Modal.
- *
- * @see Modal
- * @since 4.0.0
- */
-public final class ModalDefinition extends EphemeralInteractionDefinition implements CustomId {
-
-    private final String title;
-    private final List<TextInputDefinition> textInputs;
-
-    private ModalDefinition(Method method, Set<String> permissions, ReplyConfig replyConfig, String title, List<TextInputDefinition> textInputs) {
-        super(method, permissions, replyConfig);
-        this.title = title;
-        this.textInputs = textInputs;
-    }
-
-    /**
-     * Builds a new ModalDefinition.
-     *
-     * @param method the {@link Method} of the Modal
-     * @return an {@link Optional} holding the ModalDefinition
-     */
-    public static Optional<ModalDefinition> build(@NotNull Method method) {
-        if (!method.isAnnotationPresent(Modal.class) || !method.getDeclaringClass().isAnnotationPresent(Interaction.class)) {
-            return Optional.empty();
-        }
-
-        // Modals support up to 5 TextInputs
-        if (method.getParameters().length < 1 || method.getParameters().length > 6) {
-            log.error("An error has occurred! Skipping Modal {}.{}:",
-                    method.getDeclaringClass().getSimpleName(),
-                    method.getName(),
-                    new IllegalArgumentException("Invalid amount of parameters! Modals need between 1 and 5 TextInputs"));
-            return Optional.empty();
-        }
-
-        if (Helpers.isIncorrectParameterType(method, 0, ModalEvent.class)) {
-            return Optional.empty();
-        }
-
-        List<TextInputDefinition> textInputs = new ArrayList<>();
-        for (int i = 1; i < method.getParameters().length; i++) {
-            Parameter parameter = method.getParameters()[i];
-            TextInputDefinition.build(parameter).ifPresent(textInputs::add);
-        }
-
-        if (textInputs.isEmpty()) {
-            log.error("An error has occurred! Skipping Modal {}.{}:",
-                    method.getDeclaringClass().getSimpleName(),
-                    method.getName(),
-                    new IllegalArgumentException("Modals need at least one valid TextInput"));
-            return Optional.empty();
-        }
-
-        Set<String> permissions = new HashSet<>();
-        if (method.isAnnotationPresent(Permissions.class)) {
-            Permissions permission = method.getAnnotation(Permissions.class);
-            permissions = new HashSet<>(Arrays.asList(permission.value()));
-        }
-
-        Modal modal = method.getAnnotation(Modal.class);
-
-        return Optional.of(new ModalDefinition(method, permissions, Helpers.replyConfig(method), modal.value(), textInputs));
-    }
-
-    /**
-     * Transforms this ModalDefinition to a {@link net.dv8tion.jda.api.interactions.modals.Modal Modal}.
-     *
-     * @param runtimeId the runtimeId of the
-     *                  {@link Runtime Runtime}
-     *                  of this interaction execution
-     * @return the transformed {@link net.dv8tion.jda.api.interactions.modals.Modal Modal}
-     */
-    public net.dv8tion.jda.api.interactions.modals.Modal toModal(String runtimeId) {
-        Builder modal = net.dv8tion.jda.api.interactions.modals.Modal.create(boundCustomId(runtimeId), title);
-
-        textInputs.forEach(textInput -> modal.addActionRow(textInput.toTextInput()));
-
-        return modal.build();
-    }
-
-    /**
-     * Gets the title of the modal.
-     *
-     * @return the title of the modal
-     */
-    public String getTitle() {
-        return title;
-    }
-
-    /**
-     * Gets all text inputs this modal uses
-     *
-     * @return a list of {@link TextInputDefinition TextInputDefinitions}
-     */
-    public List<TextInputDefinition> getTextInputs() {
-        return textInputs;
-    }
-
-    @Override
-    public String getDisplayName() {
-        return title;
-    }
-
-    @Override
-    public @NotNull String boundCustomId(@NotNull String runtimeId) {
-        return "%s.%s.%s".formatted(PREFIX, runtimeId, definitionId);
-    }
-
-    @Override
-    public @NotNull String independentCustomId() {
-        throw new UnsupportedOperationException("Modals cannot be independent!");
-    }
-
-    @Override
-    public String toString() {
-        return "ModalDefinition{" +
-                "title='" + title + '\'' +
-                ", textInputs=" + textInputs +
-                ", replyConfig=" + replyConfig +
-                ", id='" + definitionId + '\'' +
-                ", method=" + method +
-                ", permissions=" + permissions +
-                '}';
-    }
-}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/ReplyConfig.java b/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/ReplyConfig.java
deleted file mode 100644
index 0270f899c..000000000
--- a/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/ReplyConfig.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.github.kaktushose.jda.commands.reflect.interactions;
-
-import com.github.kaktushose.jda.commands.dispatching.reply.GlobalReplyConfig;
-import org.jetbrains.annotations.NotNull;
-
-/// Stores the configuration values for sending replies. This acts as a representation of
-/// [com.github.kaktushose.jda.commands.annotations.interactions.ReplyConfig].
-///
-/// @see [com.github.kaktushose.jda.commands.annotations.interactions.ReplyConfig]
-/// @since 4.0.0
-public record ReplyConfig(boolean ephemeral, boolean keepComponents, boolean editReply) {
-
-    /// Constructs a new ReplyConfig using the default values specified by [GlobalReplyConfig].
-    public ReplyConfig() {
-        this(GlobalReplyConfig.ephemeral, GlobalReplyConfig.keepComponents, GlobalReplyConfig.editReply);
-    }
-
-    /// Constructs a new ReplyConfig.
-    ///
-    /// @param replyConfig the [com.github.kaktushose.jda.commands.annotations.interactions.ReplyConfig] to represent
-    public ReplyConfig(@NotNull com.github.kaktushose.jda.commands.annotations.interactions.ReplyConfig replyConfig) {
-        this(replyConfig.ephemeral(), replyConfig.keepComponents(), replyConfig.editReply());
-    }
-}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/commands/ContextCommandDefinition.java b/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/commands/ContextCommandDefinition.java
deleted file mode 100644
index c486fad9d..000000000
--- a/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/commands/ContextCommandDefinition.java
+++ /dev/null
@@ -1,111 +0,0 @@
-package com.github.kaktushose.jda.commands.reflect.interactions.commands;
-
-import com.github.kaktushose.jda.commands.internal.Helpers;
-import com.github.kaktushose.jda.commands.annotations.interactions.ContextCommand;
-import com.github.kaktushose.jda.commands.annotations.interactions.Interaction;
-import com.github.kaktushose.jda.commands.annotations.interactions.SlashCommand;
-import com.github.kaktushose.jda.commands.dispatching.events.interactions.CommandEvent;
-import com.github.kaktushose.jda.commands.reflect.MethodBuildContext;
-import com.github.kaktushose.jda.commands.reflect.interactions.ReplyConfig;
-import net.dv8tion.jda.api.Permission;
-import net.dv8tion.jda.api.entities.Message;
-import net.dv8tion.jda.api.entities.User;
-import net.dv8tion.jda.api.interactions.commands.Command;
-import net.dv8tion.jda.api.interactions.commands.DefaultMemberPermissions;
-import net.dv8tion.jda.api.interactions.commands.build.CommandData;
-import net.dv8tion.jda.api.interactions.commands.build.Commands;
-import net.dv8tion.jda.api.interactions.commands.localization.LocalizationFunction;
-import org.jetbrains.annotations.NotNull;
-
-import java.lang.reflect.Method;
-import java.util.Arrays;
-import java.util.Optional;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-/**
- * Representation of a ContextMenu command.
- *
- * @see ContextCommand
- * @since 4.0.0
- */
-public final class ContextCommandDefinition extends GenericCommandDefinition {
-
-    public ContextCommandDefinition(Method method,
-                                    ReplyConfig replyConfig,
-                                    String name,
-                                    Set<String> permissions,
-                                    boolean isGuildOnly,
-                                    boolean isNSFW,
-                                    Command.Type commandType,
-                                    Set<Permission> enabledPermissions,
-                                    SlashCommand.CommandScope scope,
-                                    LocalizationFunction localizationFunction) {
-        super(method, replyConfig, name, permissions, isGuildOnly, isNSFW, commandType, enabledPermissions, scope, localizationFunction);
-    }
-
-    public static Optional<ContextCommandDefinition> build(@NotNull MethodBuildContext context) {
-        Method method = context.method();
-        if (!method.isAnnotationPresent(ContextCommand.class) || !method.getDeclaringClass().isAnnotationPresent(Interaction.class)) {
-            return Optional.empty();
-        }
-
-        if (Helpers.isIncorrectParameterAmount(method, 2)) {
-            return Optional.empty();
-        }
-        if (Helpers.isIncorrectParameterType(method, 0, CommandEvent.class)) {
-            return Optional.empty();
-        }
-        if (Helpers.isIncorrectParameterType(method, 1, User.class) && Helpers.isIncorrectParameterType(method, 1, Message.class)) {
-            return Optional.empty();
-        }
-
-
-        ContextCommand command = method.getAnnotation(ContextCommand.class);
-
-        Set<net.dv8tion.jda.api.Permission> enabledFor = Arrays.stream(command.enabledFor()).collect(Collectors.toSet());
-        if (enabledFor.size() == 1 && enabledFor.contains(net.dv8tion.jda.api.Permission.UNKNOWN)) {
-            enabledFor.clear();
-        }
-
-        return Optional.of(new ContextCommandDefinition(
-                method,
-                Helpers.replyConfig(method),
-                command.value(),
-                Helpers.permissions(context),
-                command.isGuildOnly(),
-                command.isNSFW(),
-                command.type(),
-                enabledFor,
-                command.scope(),
-                context.localizationFunction()
-        ));
-    }
-
-    @Override
-    public CommandData toCommandData() {
-        CommandData command = Commands.context(commandType, name);
-        command.setGuildOnly(isGuildOnly)
-                .setNSFW(isNSFW)
-                .setDefaultPermissions(DefaultMemberPermissions.enabledFor(enabledPermissions))
-                .setLocalizationFunction(localizationFunction);
-        return command;
-    }
-
-    @Override
-    public String toString() {
-        return "ContextCommandDefinition{" +
-                "id='" + definitionId + '\'' +
-                ", method=" + method +
-                ", name='" + name + '\'' +
-                ", permissions=" + permissions +
-                ", isGuildOnly=" + isGuildOnly +
-                ", isNSFW=" + isNSFW +
-                ", commandType=" + commandType +
-                ", enabledPermissions=" + enabledPermissions +
-                ", scope=" + scope +
-                ", localizationFunction=" + localizationFunction +
-                ", replyConfig=" + replyConfig +
-                '}';
-    }
-}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/commands/GenericCommandDefinition.java b/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/commands/GenericCommandDefinition.java
deleted file mode 100644
index cf84968a3..000000000
--- a/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/commands/GenericCommandDefinition.java
+++ /dev/null
@@ -1,146 +0,0 @@
-package com.github.kaktushose.jda.commands.reflect.interactions.commands;
-
-import com.github.kaktushose.jda.commands.annotations.interactions.SlashCommand;
-import com.github.kaktushose.jda.commands.reflect.interactions.EphemeralInteractionDefinition;
-import com.github.kaktushose.jda.commands.reflect.interactions.ReplyConfig;
-import net.dv8tion.jda.api.Permission;
-import net.dv8tion.jda.api.interactions.commands.Command;
-import net.dv8tion.jda.api.interactions.commands.build.CommandData;
-import net.dv8tion.jda.api.interactions.commands.localization.LocalizationFunction;
-import org.jetbrains.annotations.NotNull;
-
-import java.lang.reflect.Method;
-import java.util.Set;
-
-/**
- * Generic base class of different command types.
- *
- * @see SlashCommandDefinition
- * @see ContextCommandDefinition
- * @since 4.0.0
- */
-public abstract sealed class GenericCommandDefinition
-        extends EphemeralInteractionDefinition
-        implements Comparable<GenericCommandDefinition>
-        permits ContextCommandDefinition, SlashCommandDefinition {
-
-    protected final String name;
-    protected final boolean isGuildOnly;
-    protected final boolean isNSFW;
-    protected final Command.Type commandType;
-    protected final Set<net.dv8tion.jda.api.Permission> enabledPermissions;
-    protected final SlashCommand.CommandScope scope;
-    protected final LocalizationFunction localizationFunction;
-
-    protected GenericCommandDefinition(Method method,
-                                       ReplyConfig replyConfig,
-                                       String name,
-                                       Set<String> permissions,
-                                       boolean isGuildOnly,
-                                       boolean isNSFW,
-                                       Command.Type commandType,
-                                       Set<Permission> enabledPermissions,
-                                       SlashCommand.CommandScope scope,
-                                       LocalizationFunction localizationFunction) {
-        super(method, permissions, replyConfig);
-        this.name = name;
-        this.isGuildOnly = isGuildOnly;
-        this.isNSFW = isNSFW;
-        this.commandType = commandType;
-        this.enabledPermissions = enabledPermissions;
-        this.scope = scope;
-        this.localizationFunction = localizationFunction;
-    }
-
-    /**
-     * Transforms this command definition to {@link CommandData}.
-     *
-     * @return the {@link CommandData}
-     */
-    public abstract CommandData toCommandData();
-
-    /**
-     * Gets the command name.
-     *
-     * @return the command name
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * Gets the command name.
-     *
-     * @return the command name
-     */
-    public String getDisplayName() {
-        return String.format("/%s", name);
-    }
-
-    /**
-     * Whether this command can be executed inside direct messages.
-     *
-     * @return {@code true} if this command can be executed inside direct messages
-     */
-    public boolean isGuildOnly() {
-        return isGuildOnly;
-    }
-
-    /**
-     * Whether this command can only be executed in NSFW channels.
-     *
-     * @return {@code true} if this command can only be executed in NSFW channels
-     */
-    public boolean isNSFW() {
-        return isNSFW;
-    }
-
-    /**
-     * Gets a set of Discord permission Strings this command will be enabled for by default.
-     *
-     * @return a set of Discord permission Strings this command will be enabled for by default
-     */
-    public Set<net.dv8tion.jda.api.Permission> getEnabledPermissions() {
-        return enabledPermissions;
-    }
-
-    public Command.Type getCommandType() {
-        return commandType;
-    }
-
-    public LocalizationFunction getLocalizationFunction() {
-        return localizationFunction;
-    }
-
-    /**
-     * Gets the {@link SlashCommand.CommandScope CommandScope} of this command.
-     *
-     * @return the {@link SlashCommand.CommandScope CommandScope} of this command
-     */
-    public SlashCommand.CommandScope getCommandScope() {
-        return scope;
-    }
-
-    @Override
-    public String toString() {
-        return "GenericCommandDefinition{" +
-                "id='" + definitionId + '\'' +
-                ", method=" + method +
-                ", name='" + name + '\'' +
-                ", permissions=" + permissions +
-                ", isGuildOnly=" + isGuildOnly +
-                ", isNSFW=" + isNSFW +
-                ", commandType=" + commandType +
-                ", enabledPermissions=" + enabledPermissions +
-                ", scope=" + scope +
-                ", localizationFunction=" + localizationFunction +
-                ", replyConfig=" + replyConfig +
-                '}';
-    }
-
-    @Override
-    public int compareTo(@NotNull GenericCommandDefinition command) {
-        return name.compareTo(command.name);
-    }
-
-}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/commands/SlashCommandDefinition.java b/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/commands/SlashCommandDefinition.java
deleted file mode 100644
index 94f51cd0f..000000000
--- a/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/commands/SlashCommandDefinition.java
+++ /dev/null
@@ -1,271 +0,0 @@
-package com.github.kaktushose.jda.commands.reflect.interactions.commands;
-
-import com.github.kaktushose.jda.commands.internal.Helpers;
-import com.github.kaktushose.jda.commands.annotations.interactions.Cooldown;
-import com.github.kaktushose.jda.commands.annotations.interactions.Interaction;
-import com.github.kaktushose.jda.commands.annotations.interactions.SlashCommand;
-import com.github.kaktushose.jda.commands.dispatching.events.interactions.CommandEvent;
-import com.github.kaktushose.jda.commands.reflect.CooldownDefinition;
-import com.github.kaktushose.jda.commands.reflect.MethodBuildContext;
-import com.github.kaktushose.jda.commands.reflect.ParameterDefinition;
-import com.github.kaktushose.jda.commands.reflect.interactions.AutoCompleteDefinition;
-import com.github.kaktushose.jda.commands.reflect.interactions.ReplyConfig;
-import net.dv8tion.jda.api.Permission;
-import net.dv8tion.jda.api.interactions.commands.Command;
-import net.dv8tion.jda.api.interactions.commands.DefaultMemberPermissions;
-import net.dv8tion.jda.api.interactions.commands.build.Commands;
-import net.dv8tion.jda.api.interactions.commands.build.SlashCommandData;
-import net.dv8tion.jda.api.interactions.commands.build.SubcommandData;
-import net.dv8tion.jda.api.interactions.commands.localization.LocalizationFunction;
-
-import java.lang.reflect.Method;
-import java.util.*;
-
-/**
- * Representation of a slash command.
- *
- * @see SlashCommand
- * @since 2.0.0
- */
-public final class SlashCommandDefinition extends GenericCommandDefinition {
-
-    private final String description;
-    private final List<ParameterDefinition> parameters;
-    private final CooldownDefinition cooldown;
-    private final boolean isAutoComplete;
-
-    public SlashCommandDefinition(Method method,
-                                  ReplyConfig replyConfig,
-                                  String name,
-                                  Set<String> permissions,
-                                  boolean isGuildOnly,
-                                  boolean isNSFW,
-                                  Command.Type commandType,
-                                  Set<Permission> enabledPermissions,
-                                  SlashCommand.CommandScope scope,
-                                  LocalizationFunction localizationFunction,
-                                  String description,
-                                  List<ParameterDefinition> parameters,
-                                  CooldownDefinition cooldown,
-                                  boolean isAutoComplete) {
-        super(method, replyConfig, name, permissions, isGuildOnly, isNSFW, commandType, enabledPermissions, scope, localizationFunction);
-        this.description = description;
-        this.parameters = parameters;
-        this.cooldown = cooldown;
-        this.isAutoComplete = isAutoComplete;
-    }
-
-    /**
-     * Builds a new CommandDefinition.
-     *
-     * @return an {@link Optional} holding the CommandDefinition
-     */
-    public static Optional<SlashCommandDefinition> build(MethodBuildContext context) {
-        Method method = context.method();
-        if (!method.isAnnotationPresent(SlashCommand.class) || !method.getDeclaringClass().isAnnotationPresent(Interaction.class)) {
-            return Optional.empty();
-        }
-
-        SlashCommand command = method.getAnnotation(SlashCommand.class);
-        Interaction interaction = method.getDeclaringClass().getAnnotation(Interaction.class);
-
-        String name = String.join(" ", interaction.value(), command.value())
-                .replaceAll(" +", " ")
-                .trim();
-
-        if (name.isEmpty()) {
-            logError("Labels must not be empty!", method);
-            return Optional.empty();
-        }
-
-        // build parameter definitions
-        List<ParameterDefinition> parameters = Arrays.stream(method.getParameters())
-                .map(parameter -> ParameterDefinition.build(parameter, context.validatorRegistry()))
-                .toList();
-
-        if (parameters.isEmpty()) {
-            logError(String.format("First parameter must be of type %s!", CommandEvent.class.getSimpleName()), method);
-            return Optional.empty();
-        }
-
-        // validate parameter definitions
-        for (ParameterDefinition parameter : parameters) {
-            Class<?> type = parameter.type();
-
-            // first argument must be a CommandEvent
-            if (parameter == parameters.getFirst()) {
-                if (!CommandEvent.class.isAssignableFrom(type)) {
-                    logError(String.format("First parameter must be of type %s!", CommandEvent.class.getSimpleName()), method);
-                    return Optional.empty();
-                }
-                continue;
-            }
-
-            // argument parsing can be skipped by using just a String array (the traditional way of command frameworks)
-            // this means that no other parameters are allowed in this case
-            if (type.isAssignableFrom(String[].class) && parameters.size() > 2) {
-                logError("Additional parameters aren't allowed when using arrays!", method);
-                return Optional.empty();
-            }
-        }
-
-        Set<Permission> enabledFor = Set.of(command.enabledFor());
-        if (enabledFor.size() == 1 && enabledFor.contains(Permission.UNKNOWN)) {
-            enabledFor = Set.of();
-        }
-
-        CooldownDefinition cooldownDefinition = CooldownDefinition.build(method.getAnnotation(Cooldown.class));
-        if (cooldownDefinition.delay() == 0 && context.cooldownDefinition() != null) {
-            cooldownDefinition = context.cooldownDefinition();
-        }
-
-        return Optional.of(new SlashCommandDefinition(
-                method,
-                Helpers.replyConfig(method),
-                name,
-                Helpers.permissions(context),
-                command.isGuildOnly(),
-                command.isNSFW(),
-                Command.Type.SLASH,
-                enabledFor,
-                command.scope(),
-                context.localizationFunction(),
-                command.desc(),
-                parameters,
-                cooldownDefinition,
-                context.autoCompleteDefinitions().stream()
-                        .map(AutoCompleteDefinition::getCommandNames)
-                        .flatMap(Collection::stream)
-                        .anyMatch(name::startsWith)
-        ));
-    }
-
-    private static void logError(String message, Method commandMethod) {
-        log.error("An error has occurred! Skipping Command {}.{}:",
-                commandMethod.getDeclaringClass().getSimpleName(),
-                commandMethod.getName(),
-                new IllegalArgumentException(message));
-    }
-
-    /**
-     * Transforms this command definition to a {@link SlashCommandData}.
-     *
-     * @return the transformed {@link SlashCommandData}
-     */
-    @Override
-    public SlashCommandData toCommandData() {
-        SlashCommandData command = Commands.slash(
-                name,
-                description.replaceAll("N/A", "no description")
-        );
-        command.setGuildOnly(isGuildOnly)
-                .setNSFW(isNSFW)
-                .setLocalizationFunction(localizationFunction)
-                .setDefaultPermissions(DefaultMemberPermissions.enabledFor(enabledPermissions));
-        parameters.forEach(parameter -> {
-            if (CommandEvent.class.isAssignableFrom(parameter.type())) {
-                return;
-            }
-            command.addOptions(parameter.toOptionData(isAutoComplete));
-        });
-        return command;
-    }
-
-    /**
-     * Transforms this command definition to a {@link SubcommandData}.
-     *
-     * @param label the name of the sub command
-     * @return the transformed {@link SubcommandData}
-     */
-    public SubcommandData toSubCommandData(String label) {
-        SubcommandData command = new SubcommandData(
-                label,
-                description.replaceAll("N/A", "no description")
-
-        );
-        parameters.forEach(parameter -> {
-            if (CommandEvent.class.isAssignableFrom(parameter.type())) {
-                return;
-            }
-            command.addOptions(parameter.toOptionData(isAutoComplete));
-        });
-        return command;
-    }
-
-    /**
-     * Returns the slash command description.
-     *
-     * @return the description
-     */
-    public String getDescription() {
-        return description;
-    }
-
-    /**
-     * Gets a possibly-empty list of all {@link ParameterDefinition ParameterDefinitions}.
-     *
-     * @return a possibly-empty list of all {@link ParameterDefinition ParameterDefinitions}
-     */
-    public List<ParameterDefinition> getParameters() {
-        return parameters;
-    }
-
-    /**
-     * Gets a possibly-empty list of all {@link ParameterDefinition ParameterDefinitions}
-     * excluding the {@link CommandEvent} at index 0.
-     *
-     * @return a possibly-empty list of all {@link ParameterDefinition ParameterDefinitions} excluding the
-     * {@link CommandEvent} at index 0
-     */
-    public List<ParameterDefinition> getActualParameters() {
-        return parameters.subList(parameters.isEmpty() ? 0 : 1, parameters.size());
-    }
-
-    /**
-     * Gets the {@link CooldownDefinition}. This is never null, even if the command has no cooldown.
-     *
-     * @return the {@link CooldownDefinition}
-     */
-    public CooldownDefinition getCooldown() {
-        return cooldown;
-    }
-
-    /**
-     * Whether this command has a cooldown. More formally, checks if {@link CooldownDefinition#delay()} > 0.
-     *
-     * @return {@code true} if this command has a cooldown.
-     */
-    public boolean hasCooldown() {
-        return getCooldown().delay() > 0;
-    }
-
-    /**
-     * Whether this command supports auto complete.
-     *
-     * @return {@code true} if this command supports auto complete
-     */
-    public boolean isAutoComplete() {
-        return isAutoComplete;
-    }
-
-    @Override
-    public String toString() {
-        return "SlashCommandDefinition{" +
-                "id='" + definitionId + '\'' +
-                ", method=" + method +
-                ", name='" + name + '\'' +
-                ", description='" + description + '\'' +
-                ", parameters=" + parameters +
-                ", cooldown=" + cooldown +
-                ", isAutoComplete=" + isAutoComplete +
-                ", permissions=" + permissions +
-                ", isGuildOnly=" + isGuildOnly +
-                ", isNSFW=" + isNSFW +
-                ", commandType=" + commandType +
-                ", enabledPermissions=" + enabledPermissions +
-                ", scope=" + scope +
-                ", localizationFunction=" + localizationFunction +
-                ", replyConfig=" + replyConfig +
-                '}';
-    }
-}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/components/ButtonDefinition.java b/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/components/ButtonDefinition.java
deleted file mode 100644
index 08ebf3042..000000000
--- a/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/components/ButtonDefinition.java
+++ /dev/null
@@ -1,157 +0,0 @@
-package com.github.kaktushose.jda.commands.reflect.interactions.components;
-
-import com.github.kaktushose.jda.commands.internal.Helpers;
-import com.github.kaktushose.jda.commands.annotations.interactions.Button;
-import com.github.kaktushose.jda.commands.annotations.interactions.Interaction;
-import com.github.kaktushose.jda.commands.dispatching.events.interactions.ComponentEvent;
-import com.github.kaktushose.jda.commands.reflect.MethodBuildContext;
-import com.github.kaktushose.jda.commands.reflect.interactions.ReplyConfig;
-import net.dv8tion.jda.api.entities.emoji.Emoji;
-import net.dv8tion.jda.api.interactions.components.buttons.ButtonStyle;
-import org.jetbrains.annotations.NotNull;
-
-import java.lang.reflect.Method;
-import java.util.Optional;
-import java.util.Set;
-
-/**
- * Representation of a {@link net.dv8tion.jda.api.interactions.components.buttons.Button Button}.
- *
- * @see Button
- * @since 2.3.0
- */
-public final class ButtonDefinition extends GenericComponentDefinition {
-
-    private final String label;
-    private final Emoji emoji;
-    private final String link;
-    private final ButtonStyle style;
-
-    private ButtonDefinition(Method method,
-                             Set<String> permissions,
-                             ReplyConfig replyConfig,
-                             String label,
-                             Emoji emoji,
-                             String link,
-                             ButtonStyle style) {
-        super(method, permissions, replyConfig);
-        this.label = label;
-        this.emoji = emoji;
-        this.link = link;
-        this.style = style;
-    }
-
-    /**
-     * Builds a new ButtonDefinition.
-     *
-     * @return an {@link Optional} holding the ButtonDefinition
-     */
-    public static Optional<ButtonDefinition> build(MethodBuildContext context) {
-        Method method = context.method();
-        if (!method.isAnnotationPresent(Button.class) || !method.getDeclaringClass().isAnnotationPresent(Interaction.class)) {
-            return Optional.empty();
-        }
-
-        if (Helpers.isIncorrectParameterAmount(method, 1)) {
-            return Optional.empty();
-        }
-
-        if (Helpers.isIncorrectParameterType(method, 0, ComponentEvent.class)) {
-            return Optional.empty();
-        }
-
-        Button button = method.getAnnotation(Button.class);
-        Emoji emoji;
-        String emojiString = button.emoji();
-        if (emojiString.isEmpty()) {
-            emoji = null;
-        } else {
-            emoji = Emoji.fromFormatted(emojiString);
-        }
-
-        return Optional.of(new ButtonDefinition(
-                method,
-                Helpers.permissions(context),
-                Helpers.replyConfig(method),
-                button.value(),
-                emoji,
-                button.link(),
-                button.style()
-        ));
-    }
-
-    /**
-     * Transforms this command definition to a {@link net.dv8tion.jda.api.interactions.components.buttons.Button Button}.
-     *
-     * @return the transformed {@link net.dv8tion.jda.api.interactions.components.buttons.Button Button}
-     */
-    @NotNull
-    public net.dv8tion.jda.api.interactions.components.buttons.Button toButton() {
-        String label = getLabel().orElse("");
-        String idOrUrl = getLink().orElse(this.definitionId);
-        if (emoji == null) {
-            return net.dv8tion.jda.api.interactions.components.buttons.Button.of(style, idOrUrl, label);
-        } else {
-            return net.dv8tion.jda.api.interactions.components.buttons.Button.of(style, idOrUrl, label, emoji);
-        }
-    }
-
-    /**
-     * Gets the label of the button.
-     *
-     * @return an {@link Optional} holding the label
-     */
-    @NotNull
-    public Optional<String> getLabel() {
-        return Optional.ofNullable(label.isEmpty() ? null : label);
-    }
-
-    /**
-     * Gets the {@link Emoji} of the button.
-     *
-     * @return an {@link Optional} holding the {@link Emoji}
-     */
-    @NotNull
-    public Optional<Emoji> getEmoji() {
-        return Optional.ofNullable(emoji);
-    }
-
-    /**
-     * Gets the link of the button.
-     *
-     * @return an {@link Optional} holding the link
-     */
-    @NotNull
-    public Optional<String> getLink() {
-        return Optional.ofNullable(link.isEmpty() ? null : link);
-    }
-
-    /**
-     * Gets the {@link ButtonStyle}.
-     *
-     * @return the {@link ButtonStyle}
-     */
-    @NotNull
-    public ButtonStyle getStyle() {
-        return style;
-    }
-
-    @Override
-    public String getDisplayName() {
-        return getLabel().orElse(definitionId);
-    }
-
-    @Override
-    public String toString() {
-        return "ButtonDefinition{" +
-                "label='" + label + '\'' +
-                ", emoji=" + emoji +
-                ", link='" + link + '\'' +
-                ", style=" + style +
-                ", replyConfig=" + replyConfig +
-                ", permissions=" + permissions +
-                ", id='" + definitionId + '\'' +
-                ", method=" + method +
-                '}';
-    }
-}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/components/GenericComponentDefinition.java b/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/components/GenericComponentDefinition.java
deleted file mode 100644
index 7a09ad808..000000000
--- a/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/components/GenericComponentDefinition.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.github.kaktushose.jda.commands.reflect.interactions.components;
-
-import com.github.kaktushose.jda.commands.reflect.interactions.CustomId;
-import com.github.kaktushose.jda.commands.reflect.interactions.EphemeralInteractionDefinition;
-import com.github.kaktushose.jda.commands.reflect.interactions.ReplyConfig;
-import com.github.kaktushose.jda.commands.reflect.interactions.components.menus.GenericSelectMenuDefinition;
-import org.jetbrains.annotations.NotNull;
-
-import java.lang.reflect.Method;
-import java.util.Set;
-
-/**
- * Marker class for name definitions.
- *
- * @see ButtonDefinition
- * @see com.github.kaktushose.jda.commands.reflect.interactions.components.menus.GenericSelectMenuDefinition GenericSelectMenuDefinition
- * @since 4.0.0
- */
-public abstract sealed class GenericComponentDefinition extends EphemeralInteractionDefinition implements CustomId
-        permits ButtonDefinition, GenericSelectMenuDefinition {
-
-    protected GenericComponentDefinition(Method method, Set<String> permissions, ReplyConfig replyConfig) {
-        super(method, permissions, replyConfig);
-    }
-
-    @Override
-    public @NotNull String boundCustomId(@NotNull String runtimeId) {
-        return "%s.%s.%s".formatted(PREFIX, runtimeId, definitionId);
-    }
-
-    @Override
-    public @NotNull String independentCustomId() {
-        return "%s.independent.%s".formatted(PREFIX, definitionId);
-    }
-}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/components/menus/EntitySelectMenuDefinition.java b/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/components/menus/EntitySelectMenuDefinition.java
deleted file mode 100644
index 197978167..000000000
--- a/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/components/menus/EntitySelectMenuDefinition.java
+++ /dev/null
@@ -1,154 +0,0 @@
-package com.github.kaktushose.jda.commands.reflect.interactions.components.menus;
-
-import com.github.kaktushose.jda.commands.internal.Helpers;
-import com.github.kaktushose.jda.commands.annotations.interactions.EntitySelectMenu;
-import com.github.kaktushose.jda.commands.annotations.interactions.Interaction;
-import com.github.kaktushose.jda.commands.dispatching.events.interactions.ComponentEvent;
-import com.github.kaktushose.jda.commands.reflect.MethodBuildContext;
-import com.github.kaktushose.jda.commands.reflect.interactions.ReplyConfig;
-import net.dv8tion.jda.api.entities.Mentions;
-import net.dv8tion.jda.api.entities.channel.ChannelType;
-import net.dv8tion.jda.api.interactions.components.selections.EntitySelectMenu.DefaultValue;
-import net.dv8tion.jda.api.interactions.components.selections.EntitySelectMenu.SelectTarget;
-
-import java.lang.reflect.Method;
-import java.util.HashSet;
-import java.util.Optional;
-import java.util.Set;
-
-/**
- * Representation of a {@link net.dv8tion.jda.api.interactions.components.selections.EntitySelectMenu EntitySelectMenu}.
- *
- * @see EntitySelectMenu
- * @since 4.0.0
- */
-public final class EntitySelectMenuDefinition extends GenericSelectMenuDefinition<net.dv8tion.jda.api.interactions.components.selections.EntitySelectMenu> {
-
-    private final Set<SelectTarget> selectTargets;
-    private final Set<DefaultValue> defaultValues;
-    private final Set<ChannelType> channelTypes;
-
-    private EntitySelectMenuDefinition(Method method,
-                                       Set<String> permissions,
-                                       ReplyConfig replyConfig,
-                                       Set<SelectTarget> selectTargets,
-                                       Set<DefaultValue> defaultValues,
-                                       Set<ChannelType> channelTypes,
-                                       String placeholder,
-                                       int minValue,
-                                       int maxValue) {
-        super(method, permissions, replyConfig, placeholder, minValue, maxValue);
-        this.selectTargets = selectTargets;
-        this.defaultValues = defaultValues;
-        this.channelTypes = channelTypes;
-    }
-
-    /**
-     * Builds a new EntitySelectMenuDefinition.
-     *
-     * @return an {@link Optional} holding the EntitySelectMenuDefinition
-     */
-    public static Optional<EntitySelectMenuDefinition> build(MethodBuildContext context) {
-        Method method = context.method();
-        if (!method.isAnnotationPresent(EntitySelectMenu.class) || !method.getDeclaringClass().isAnnotationPresent(Interaction.class)) {
-            return Optional.empty();
-        }
-
-        if (Helpers.isIncorrectParameterAmount(method, 2)) {
-            return Optional.empty();
-        }
-
-        if (Helpers.isIncorrectParameterType(method, 0, ComponentEvent.class) ||
-                Helpers.isIncorrectParameterType(method, 1, Mentions.class)) {
-            return Optional.empty();
-        }
-
-        EntitySelectMenu selectMenu = method.getAnnotation(EntitySelectMenu.class);
-
-        Set<DefaultValue> defaultValueSet = new HashSet<>();
-        for (long id : selectMenu.defaultChannels()) {
-            if (id < 0) continue;
-            defaultValueSet.add(DefaultValue.channel(id));
-        }
-        for (long id : selectMenu.defaultUsers()) {
-            if (id < 0) continue;
-            defaultValueSet.add(DefaultValue.user(id));
-        }
-        for (long id : selectMenu.defaultRoles()) {
-            if (id < 0) continue;
-            defaultValueSet.add(DefaultValue.role(id));
-        }
-
-        return Optional.of(new EntitySelectMenuDefinition(
-                method,
-                Helpers.permissions(context),
-                Helpers.replyConfig(method),
-                Set.of(selectMenu.value()),
-                defaultValueSet,
-                new HashSet<>(Set.of(selectMenu.channelTypes())),
-                selectMenu.placeholder(),
-                selectMenu.minValue(),
-                selectMenu.maxValue()
-        ));
-    }
-
-    @Override
-    public net.dv8tion.jda.api.interactions.components.selections.EntitySelectMenu toSelectMenu(String customId, boolean enabled) {
-        var menu = net.dv8tion.jda.api.interactions.components.selections.EntitySelectMenu.create(customId, selectTargets)
-                .setDefaultValues(defaultValues)
-                .setPlaceholder(placeholder)
-                .setRequiredRange(minValue, maxValue)
-                .setDisabled(!enabled);
-
-        // ChannelType.UNKNOWN is the default value inside the annotation. if this statement is true, we can assume that
-        // no channel type was selected
-        channelTypes.remove(ChannelType.UNKNOWN);
-        if (!channelTypes.isEmpty()) {
-            menu.setChannelTypes(channelTypes);
-        }
-        return menu.build();
-    }
-
-    /**
-     * Gets a set of the {@link SelectTarget SelectTargets}.
-     *
-     * @return a set of the {@link SelectTarget SelectTargets}
-     */
-    public Set<SelectTarget> getSelectTargets() {
-        return selectTargets;
-    }
-
-    /**
-     * Gets a set of the {@link DefaultValue DefaultValues}.
-     *
-     * @return a set of the {@link DefaultValue DefaultValues}
-     */
-    public Set<DefaultValue> getDefaultValues() {
-        return defaultValues;
-    }
-
-    /**
-     * Gets a set of the {@link ChannelType ChannelTypes}.
-     *
-     * @return a set of the {@link ChannelType ChannelTypes}
-     */
-    public Set<ChannelType> getChannelTypes() {
-        return channelTypes;
-    }
-
-    @Override
-    public String toString() {
-        return "EntitySelectMenuDefinition{" +
-                "selectTargets=" + selectTargets +
-                ", defaultValues=" + defaultValues +
-                ", channelTypes=" + channelTypes +
-                ", placeholder='" + placeholder + '\'' +
-                ", minValue=" + minValue +
-                ", maxValue=" + maxValue +
-                ", permissions=" + permissions +
-                ", replyConfig=" + replyConfig +
-                ", id='" + definitionId + '\'' +
-                ", method=" + method +
-                '}';
-    }
-}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/components/menus/GenericSelectMenuDefinition.java b/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/components/menus/GenericSelectMenuDefinition.java
deleted file mode 100644
index 94508bada..000000000
--- a/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/components/menus/GenericSelectMenuDefinition.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package com.github.kaktushose.jda.commands.reflect.interactions.components.menus;
-
-import com.github.kaktushose.jda.commands.dispatching.internal.Runtime;
-import com.github.kaktushose.jda.commands.reflect.interactions.ReplyConfig;
-import com.github.kaktushose.jda.commands.reflect.interactions.components.GenericComponentDefinition;
-import net.dv8tion.jda.api.interactions.components.selections.SelectMenu;
-
-import java.lang.reflect.Method;
-import java.util.Set;
-
-/**
- * Abstract base class for select menus.
- *
- * @see EntitySelectMenuDefinition
- * @see StringSelectMenuDefinition
- * @since 4.0.0
- */
-public abstract sealed class GenericSelectMenuDefinition<T extends SelectMenu> extends GenericComponentDefinition
-        permits EntitySelectMenuDefinition, StringSelectMenuDefinition {
-
-    protected final String placeholder;
-    protected final int minValue;
-    protected final int maxValue;
-
-    protected GenericSelectMenuDefinition(Method method,
-                                          Set<String> permissions,
-                                          ReplyConfig replyConfig,
-                                          String placeholder,
-                                          int minValue,
-                                          int maxValue) {
-        super(method, permissions, replyConfig);
-        this.placeholder = placeholder;
-        this.minValue = minValue;
-        this.maxValue = maxValue;
-    }
-
-    /**
-     * Transforms this definition to a select menu name.
-     *
-     * @param customId the runtimeId of the
-     *                 {@link Runtime Runtime}
-     *                 of this interaction execution
-     * @param enabled  {@code true} if the name should be enabled
-     * @return the select menu name
-     */
-    public abstract T toSelectMenu(String customId, boolean enabled);
-
-    /**
-     * Gets the placeholder string.
-     *
-     * @return the placeholder string
-     */
-    public String getPlaceholder() {
-        return placeholder;
-    }
-
-    /**
-     * Gets the minimum value.
-     *
-     * @return the minimum value
-     */
-    public int getMinValue() {
-        return minValue;
-    }
-
-    /**
-     * Gets the maximum value.
-     *
-     * @return the maximum value
-     */
-    public int getMaxValue() {
-        return maxValue;
-    }
-
-    @Override
-    public String getDisplayName() {
-        return placeholder.isEmpty() ? "Select Menu" : placeholder;
-    }
-}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/components/menus/SelectOptionDefinition.java b/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/components/menus/SelectOptionDefinition.java
deleted file mode 100644
index d714a9874..000000000
--- a/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/components/menus/SelectOptionDefinition.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.github.kaktushose.jda.commands.reflect.interactions.components.menus;
-
-import com.github.kaktushose.jda.commands.annotations.interactions.SelectOption;
-import net.dv8tion.jda.api.entities.emoji.Emoji;
-
-import javax.annotation.Nullable;
-
-/**
- * Representation of a {@link net.dv8tion.jda.api.interactions.components.selections.SelectOption SelectOption}.
- *
- * @see SelectOption
- * @since 4.0.0
- */
-public record SelectOptionDefinition(
-        String value,
-        String label,
-        String description,
-        @Nullable Emoji emoji,
-        boolean isDefault
-) {
-
-    /**
-     * Builds a new SelectOptionDefinition.
-     *
-     * @param option the {@link SelectOption} to build the SelectOptionDefinition from
-     * @return the SelectOptionDefinition
-     */
-    public static SelectOptionDefinition build(SelectOption option) {
-        Emoji emoji;
-        String emojiString = option.emoji();
-        if (emojiString.isEmpty()) {
-            emoji = null;
-        } else {
-            emoji = Emoji.fromFormatted(emojiString);
-        }
-
-        return new SelectOptionDefinition(option.value(), option.label(), option.description(), emoji, option.isDefault());
-    }
-
-    public net.dv8tion.jda.api.interactions.components.selections.SelectOption toSelectOption() {
-        return net.dv8tion.jda.api.interactions.components.selections.SelectOption.of(label, value)
-                .withDescription(description)
-                .withEmoji(emoji);
-    }
-}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/components/menus/StringSelectMenuDefinition.java b/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/components/menus/StringSelectMenuDefinition.java
deleted file mode 100644
index 965651000..000000000
--- a/src/main/java/com/github/kaktushose/jda/commands/reflect/interactions/components/menus/StringSelectMenuDefinition.java
+++ /dev/null
@@ -1,113 +0,0 @@
-package com.github.kaktushose.jda.commands.reflect.interactions.components.menus;
-
-import com.github.kaktushose.jda.commands.internal.Helpers;
-import com.github.kaktushose.jda.commands.annotations.interactions.Interaction;
-import com.github.kaktushose.jda.commands.annotations.interactions.SelectOption;
-import com.github.kaktushose.jda.commands.annotations.interactions.StringSelectMenu;
-import com.github.kaktushose.jda.commands.dispatching.events.interactions.ComponentEvent;
-import com.github.kaktushose.jda.commands.reflect.MethodBuildContext;
-import com.github.kaktushose.jda.commands.reflect.interactions.ReplyConfig;
-
-import java.lang.reflect.Method;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Optional;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-/**
- * Representation of a {@link net.dv8tion.jda.api.interactions.components.selections.StringSelectMenu StringSelectMenu}.
- *
- * @see StringSelectMenu
- * @since 4.0.0
- */
-public final class StringSelectMenuDefinition extends GenericSelectMenuDefinition<net.dv8tion.jda.api.interactions.components.selections.StringSelectMenu> {
-
-    private final Set<SelectOptionDefinition> selectOptions;
-
-    private StringSelectMenuDefinition(Method method,
-                                       Set<String> permissions,
-                                       ReplyConfig replyConfig,
-                                       Set<SelectOptionDefinition> selectOptions,
-                                       String placeholder,
-                                       int minValue,
-                                       int maxValue) {
-        super(method, permissions, replyConfig, placeholder, minValue, maxValue);
-        this.selectOptions = selectOptions;
-    }
-
-    /**
-     * Builds a new StringSelectMenuDefinition.
-     *
-     * @return an {@link Optional} holding the StringSelectMenuDefinition
-     */
-    public static Optional<StringSelectMenuDefinition> build(MethodBuildContext context) {
-        Method method = context.method();
-        if (!method.isAnnotationPresent(StringSelectMenu.class) || !method.getDeclaringClass().isAnnotationPresent(Interaction.class)) {
-            return Optional.empty();
-        }
-
-        if (Helpers.isIncorrectParameterAmount(method, 2)) {
-            return Optional.empty();
-        }
-
-        if (Helpers.isIncorrectParameterType(method, 0, ComponentEvent.class) ||
-                Helpers.isIncorrectParameterType(method, 1, List.class)) {
-            return Optional.empty();
-        }
-
-        StringSelectMenu selectMenu = method.getAnnotation(StringSelectMenu.class);
-
-        Set<SelectOptionDefinition> selectOptions = new HashSet<>();
-        for (SelectOption option : method.getDeclaredAnnotationsByType(SelectOption.class)) {
-            selectOptions.add(SelectOptionDefinition.build(option));
-        }
-
-        return Optional.of(new StringSelectMenuDefinition(
-                method,
-                Helpers.permissions(context),
-                Helpers.replyConfig(method),
-                selectOptions,
-                selectMenu.value(),
-                selectMenu.minValue(),
-                selectMenu.maxValue()
-        ));
-    }
-
-    public net.dv8tion.jda.api.interactions.components.selections.StringSelectMenu toSelectMenu(String customId, boolean enabled) {
-        return net.dv8tion.jda.api.interactions.components.selections.StringSelectMenu.create(customId)
-                .setPlaceholder(placeholder)
-                .setRequiredRange(minValue, maxValue)
-                .addOptions(selectOptions.stream().map(SelectOptionDefinition::toSelectOption).collect(Collectors.toSet()))
-                .setDefaultOptions(selectOptions.stream()
-                        .filter(SelectOptionDefinition::isDefault)
-                        .map(SelectOptionDefinition::toSelectOption)
-                        .collect(Collectors.toSet())
-                )
-                .setDisabled(!enabled)
-                .build();
-    }
-
-    /**
-     * Gets a set of all {@link SelectOptionDefinition SelectOptionDefinitions}.
-     *
-     * @return a set of all {@link SelectOptionDefinition SelectOptionDefinitions}
-     */
-    public Set<SelectOptionDefinition> getSelectOptions() {
-        return selectOptions;
-    }
-
-    @Override
-    public String toString() {
-        return "StringSelectMenuDefinition{" +
-                "selectOptions=" + selectOptions +
-                ", placeholder='" + placeholder + '\'' +
-                ", minValue=" + minValue +
-                ", maxValue=" + maxValue +
-                ", replyConfig=" + replyConfig +
-                ", permissions=" + permissions +
-                ", id='" + definitionId + '\'' +
-                ", method=" + method +
-                '}';
-    }
-}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/reflect/package-info.java b/src/main/java/com/github/kaktushose/jda/commands/reflect/package-info.java
deleted file mode 100644
index a5c27873d..000000000
--- a/src/main/java/com/github/kaktushose/jda/commands/reflect/package-info.java
+++ /dev/null
@@ -1,4 +0,0 @@
-/**
- * Classes that provide reflective access to command definitions.
- */
-package com.github.kaktushose.jda.commands.reflect;
diff --git a/src/main/java/com/github/kaktushose/jda/commands/scope/DefaultGuildScopeProvider.java b/src/main/java/com/github/kaktushose/jda/commands/scope/DefaultGuildScopeProvider.java
index 7f8e2b0bc..156c44b44 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/scope/DefaultGuildScopeProvider.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/scope/DefaultGuildScopeProvider.java
@@ -5,12 +5,9 @@
 import java.util.Collections;
 import java.util.Set;
 
-/**
- * Default implementation of {@link GuildScopeProvider}. <b>This will always return an empty Set!</b>
- *
- * @see GuildScopeProvider
- * @since 4.0.0
- */
+/// Default implementation of [GuildScopeProvider]. **This will always return an empty Set!**
+///
+/// @see GuildScopeProvider
 public class DefaultGuildScopeProvider implements GuildScopeProvider {
 
     /// @return always an empty set
diff --git a/src/main/java/com/github/kaktushose/jda/commands/scope/GuildScopeProvider.java b/src/main/java/com/github/kaktushose/jda/commands/scope/GuildScopeProvider.java
index 15c1cf0b1..7329a0b88 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/scope/GuildScopeProvider.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/scope/GuildScopeProvider.java
@@ -5,22 +5,17 @@
 import java.util.Set;
 import java.util.function.Function;
 
-/**
- * Interface for declaring on which Guilds a guild scoped command should be registered.
- *
- * @see com.github.kaktushose.jda.commands.annotations.Implementation
- * @see DefaultGuildScopeProvider
- * @since 4.0.0
- */
+/// Interface for declaring on which Guilds a guild scoped command should be registered.
+///
+/// @see com.github.kaktushose.jda.commands.annotations.Implementation Implementation
+/// @see DefaultGuildScopeProvider
 @FunctionalInterface
 public interface GuildScopeProvider extends Function<CommandData, Set<Long>> {
 
-    /**
-     * Gets a Set of guild ids the provided command should be registered for.
-     *
-     * @param commandData a copy of the {@link CommandData} to register
-     * @return a Set of guild ids the provided command should be registered for
-     */
+    /// Gets a Set of guild ids the provided command should be registered for.
+    ///
+    /// @param commandData a copy of the [CommandData] to register
+    /// @return a Set of guild ids the provided command should be registered for
     Set<Long> apply(CommandData commandData);
 
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/scope/package-info.java b/src/main/java/com/github/kaktushose/jda/commands/scope/package-info.java
index 530d00f29..6383aefac 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/scope/package-info.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/scope/package-info.java
@@ -1,4 +1,2 @@
-/**
- * Contains everything to resolve the guilds for guild commands.
- */
+/// Contains everything to resolve the guilds for guild commands.
 package com.github.kaktushose.jda.commands.scope;
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
index c3c72b9aa..76a58cfbd 100644
--- a/src/main/java/module-info.java
+++ b/src/main/java/module-info.java
@@ -7,7 +7,6 @@
     requires org.reflections;
     requires java.desktop;
     requires org.slf4j;
-    requires kotlin.stdlib;
 
     // base package
     exports com.github.kaktushose.jda.commands;
@@ -17,23 +16,33 @@
     exports com.github.kaktushose.jda.commands.annotations.constraints;
     exports com.github.kaktushose.jda.commands.annotations.interactions;
 
+    // definitions
+    exports com.github.kaktushose.jda.commands.definitions;
+    exports com.github.kaktushose.jda.commands.definitions.interactions;
+    exports com.github.kaktushose.jda.commands.definitions.interactions.command;
+    exports com.github.kaktushose.jda.commands.definitions.interactions.component;
+    exports com.github.kaktushose.jda.commands.definitions.interactions.component.menu;
+    exports com.github.kaktushose.jda.commands.definitions.description;
+    exports com.github.kaktushose.jda.commands.definitions.description.reflective;
+    exports com.github.kaktushose.jda.commands.definitions.features;
+
     // dependency injection
     exports com.github.kaktushose.jda.commands.dependency;
 
     // dispatching api
-    exports com.github.kaktushose.jda.commands.dispatching;
+    exports com.github.kaktushose.jda.commands.dispatching.expiration;
+    exports com.github.kaktushose.jda.commands.dispatching.context;
+    exports com.github.kaktushose.jda.commands.dispatching.reply;
+
     exports com.github.kaktushose.jda.commands.dispatching.adapter;
     exports com.github.kaktushose.jda.commands.dispatching.adapter.impl;
 
-    exports com.github.kaktushose.jda.commands.dispatching.context;
     exports com.github.kaktushose.jda.commands.dispatching.events;
     exports com.github.kaktushose.jda.commands.dispatching.events.interactions;
 
     exports com.github.kaktushose.jda.commands.dispatching.middleware;
     exports com.github.kaktushose.jda.commands.dispatching.middleware.impl;
 
-    exports com.github.kaktushose.jda.commands.dispatching.reply;
-
     exports com.github.kaktushose.jda.commands.dispatching.validation;
     exports com.github.kaktushose.jda.commands.dispatching.validation.impl;
 
diff --git a/src/test/java/adapting/mock/JDACommandsMock.java b/src/test/java/adapting/mock/JDACommandsMock.java
index e5374c9fc..12e7b5a22 100644
--- a/src/test/java/adapting/mock/JDACommandsMock.java
+++ b/src/test/java/adapting/mock/JDACommandsMock.java
@@ -1,13 +1,13 @@
 package adapting.mock;
 
-import com.github.kaktushose.jda.commands.internal.JDAContext;
-import com.github.kaktushose.jda.commands.internal.register.SlashCommandUpdater;
+import com.github.kaktushose.jda.commands.definitions.interactions.InteractionRegistry;
 import com.github.kaktushose.jda.commands.dependency.DependencyInjector;
-import com.github.kaktushose.jda.commands.dispatching.internal.JDAEventListener;
 import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapterRegistry;
+import com.github.kaktushose.jda.commands.dispatching.JDAEventListener;
 import com.github.kaktushose.jda.commands.dispatching.middleware.MiddlewareRegistry;
 import com.github.kaktushose.jda.commands.dispatching.validation.ValidatorRegistry;
-import com.github.kaktushose.jda.commands.reflect.InteractionRegistry;
+import com.github.kaktushose.jda.commands.internal.JDAContext;
+import com.github.kaktushose.jda.commands.internal.register.SlashCommandUpdater;
 
 
 public record JDACommandsMock(
diff --git a/src/test/java/commands/SlashCommandDefinitionTest.java b/src/test/java/commands/SlashCommandDefinitionTest.java
index f976a8f0c..5f3732c73 100644
--- a/src/test/java/commands/SlashCommandDefinitionTest.java
+++ b/src/test/java/commands/SlashCommandDefinitionTest.java
@@ -1,20 +1,22 @@
 package commands;
 
 import com.github.kaktushose.jda.commands.annotations.interactions.Interaction;
+import com.github.kaktushose.jda.commands.definitions.description.MethodDescription;
+import com.github.kaktushose.jda.commands.definitions.description.ParameterDescription;
+import com.github.kaktushose.jda.commands.definitions.description.reflective.ReflectiveDescriptor;
+import com.github.kaktushose.jda.commands.definitions.interactions.MethodBuildContext;
+import com.github.kaktushose.jda.commands.definitions.interactions.command.SlashCommandDefinition;
 import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapterRegistry;
 import com.github.kaktushose.jda.commands.dispatching.events.interactions.CommandEvent;
 import com.github.kaktushose.jda.commands.dispatching.validation.ValidatorRegistry;
-import com.github.kaktushose.jda.commands.reflect.CooldownDefinition;
-import com.github.kaktushose.jda.commands.reflect.MethodBuildContext;
-import com.github.kaktushose.jda.commands.reflect.interactions.commands.SlashCommandDefinition;
 import net.dv8tion.jda.api.interactions.commands.localization.ResourceBundleLocalizationFunction;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
-import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
-import java.util.Optional;
-import java.util.Set;
+import java.lang.reflect.Modifier;
+import java.lang.reflect.Parameter;
+import java.util.*;
 import java.util.concurrent.TimeUnit;
 
 import static org.junit.jupiter.api.Assertions.*;
@@ -36,22 +38,54 @@ public static void setup() {
     }
 
     public static MethodBuildContext getBuildContext(Method method) {
+        var clazz = new ReflectiveDescriptor().apply(method.getClass());
+
         return new MethodBuildContext(
                 validator,
                 ResourceBundleLocalizationFunction.empty().build(),
                 controller.getAnnotation(Interaction.class),
                 Set.of(),
-                CooldownDefinition.build(null),
-                method,
+                SlashCommandDefinition.CooldownDefinition.build(null),
+                clazz,
+                method(method),
                 Set.of()
         );
     }
 
+    private static MethodDescription method(Method method) {
+        if (!Modifier.isPublic(method.getModifiers())) return null;
+        List<ParameterDescription> parameters = Arrays.stream(method.getParameters())
+                .map(SlashCommandDefinitionTest::parameter)
+                .toList();
+
+
+        return new MethodDescription(
+                method.getDeclaringClass(),
+                method.getReturnType(),
+                method.getName(),
+                parameters,
+                toList(method.getAnnotations()),
+                (instance, arguments) -> method.invoke(instance, arguments.toArray())
+        );
+    }
+
+    private static ParameterDescription parameter(Parameter parameter) {
+        return new ParameterDescription(
+                parameter.getType(),
+                parameter.getName(),
+                toList(parameter.getAnnotations())
+        );
+    }
+
+    private static <T> Collection<T> toList(T[] array) {
+        return Arrays.stream(array).toList();
+    }
+
     @Test
-    public void method_withoutAnnotation_ShouldReturnEmpty() throws NoSuchMethodException {
+    public void method_withoutAnnotation_ShouldThrow() throws NoSuchMethodException {
         Method method = controller.getDeclaredMethod("noAnnotation");
 
-        assertEquals(Optional.empty(), SlashCommandDefinition.build(getBuildContext(method)));
+        assertThrows(NoSuchElementException.class, () -> SlashCommandDefinition.build(getBuildContext(method)));
     }
 
     @Test
@@ -76,116 +110,89 @@ public void method_withWrongCommandEvent_ShouldReturnEmpty() throws NoSuchMethod
     }
 
     @Test
-    public void method_withCommandEvent_ShouldWork() throws NoSuchMethodException, InvocationTargetException, InstantiationException, IllegalAccessException {
+    public void method_withCommandEvent_ShouldWork() throws NoSuchMethodException {
         Method method = controller.getDeclaredMethod("commandEvent", CommandEvent.class);
-        SlashCommandDefinition definition = SlashCommandDefinition.build(getBuildContext(method)).orElse(null);
+        SlashCommandDefinition definition = (SlashCommandDefinition) SlashCommandDefinition.build(getBuildContext(method)).orElse(null);
 
         assertNotNull(definition);
 
-        assertEquals(definition.getMethod(), method);
 
-        assertEquals(1, definition.getParameters().size());
-        assertEquals(CommandEvent.class, definition.getParameters().get(0).type());
+        assertTrue(definition.commandParameters().isEmpty());
     }
 
     @Test
-    public void method_withUnsupportedType_ShouldWork() throws NoSuchMethodException, InvocationTargetException, InstantiationException, IllegalAccessException {
+    public void method_withUnsupportedType_ShouldWork() throws NoSuchMethodException {
         Method method = controller.getDeclaredMethod("unsupported", CommandEvent.class, UnsupportedType.class);
 
-        SlashCommandDefinition definition = SlashCommandDefinition.build(getBuildContext(method)).orElse(null);
+        SlashCommandDefinition definition = (SlashCommandDefinition) SlashCommandDefinition.build(getBuildContext(method)).orElse(null);
 
         assertNotNull(definition);
 
-        assertEquals(definition.getMethod(), method);
 
-        assertEquals(2, definition.getParameters().size());
-        assertEquals(CommandEvent.class, definition.getParameters().get(0).type());
-        assertEquals(UnsupportedType.class, definition.getParameters().get(1).type());
-    }
-
-    @Test
-    public void method_withStringArray_ShouldWork() throws NoSuchMethodException, InvocationTargetException, InstantiationException, IllegalAccessException {
-        Method method = controller.getDeclaredMethod("arrayArgument", CommandEvent.class, String[].class);
-        SlashCommandDefinition definition = SlashCommandDefinition.build(getBuildContext(method)).orElse(null);
-
-        assertNotNull(definition);
-
-        assertEquals(definition.getMethod(), method);
-
-        assertEquals(2, definition.getParameters().size());
-        assertEquals(CommandEvent.class, definition.getParameters().get(0).type());
-        assertEquals(String[].class, definition.getParameters().get(1).type());
-    }
-
-    @Test
-    public void method_withArgumentsAfterArray_ShouldReturnEmpty() throws NoSuchMethodException {
-        Method method = controller.getDeclaredMethod("argsAfterArray", CommandEvent.class, String[].class, int.class);
-
-        assertEquals(Optional.empty(), SlashCommandDefinition.build(getBuildContext(method)));
+        assertEquals(1, definition.commandParameters().size());
+        assertEquals(UnsupportedType.class, definition.commandParameters().getFirst().type());
     }
 
     @Test
     public void method_withArgumentsAfterOptional_ShouldWork() throws NoSuchMethodException {
         Method method = controller.getDeclaredMethod("argsAfterOptional", CommandEvent.class, String.class, int.class);
 
-        SlashCommandDefinition definition = SlashCommandDefinition.build(getBuildContext(method)).orElse(null);
+        SlashCommandDefinition definition = (SlashCommandDefinition) SlashCommandDefinition.build(getBuildContext(method)).orElse(null);
 
         assertNotNull(definition);
 
-        assertEquals(definition.getMethod(), method);
 
-        assertEquals(3, definition.getParameters().size());
-        assertEquals(CommandEvent.class, definition.getParameters().get(0).type());
-        assertTrue(definition.getParameters().get(1).isOptional());
-        assertFalse(definition.getParameters().get(2).isOptional());
+        assertEquals(2, definition.commandParameters().size());
+        var parameters = List.copyOf(definition.commandParameters());
+        assertTrue(parameters.get(0).optional());
+        assertFalse(parameters.get(1).optional());
     }
 
     @Test
-    public void method_withOptionalAfterOptional_ShouldWork() throws NoSuchMethodException, InvocationTargetException, InstantiationException, IllegalAccessException {
+    public void method_withOptionalAfterOptional_ShouldWork() throws NoSuchMethodException {
         Method method = controller.getDeclaredMethod("optionalAfterOptional", CommandEvent.class, String.class, int.class);
-        SlashCommandDefinition definition = SlashCommandDefinition.build(getBuildContext(method)).orElse(null);
+        SlashCommandDefinition definition = (SlashCommandDefinition) SlashCommandDefinition.build(getBuildContext(method)).orElse(null);
 
         assertNotNull(definition);
 
-        assertEquals(definition.getMethod(), method);
 
-        assertEquals(3, definition.getParameters().size());
-        assertEquals(CommandEvent.class, definition.getParameters().get(0).type());
-        assertEquals(String.class, definition.getParameters().get(1).type());
-        assertEquals(Integer.class, definition.getParameters().get(2).type());
+        assertEquals(2, definition.commandParameters().size());
+        var parameters = List.copyOf(definition.commandParameters());
+        assertEquals(String.class, parameters.get(0).type());
+        assertEquals(Integer.class, parameters.get(1).type());
     }
 
     @Test
     public void cooldown_zeroTimeUnits_ShouldNotBeSet() throws NoSuchMethodException {
         Method method = controller.getDeclaredMethod("zeroCooldown", CommandEvent.class);
-        SlashCommandDefinition definition = SlashCommandDefinition.build(getBuildContext(method)).orElse(null);
+        SlashCommandDefinition definition = (SlashCommandDefinition) SlashCommandDefinition.build(getBuildContext(method)).orElse(null);
 
         assertNotNull(definition);
 
-        assertFalse(definition.hasCooldown());
+        assertFalse(definition.cooldown().delay() > 0);
     }
 
     @Test
     public void cooldown_tenMilliseconds_ShouldWork() throws NoSuchMethodException {
         Method method = controller.getDeclaredMethod("cooldown", CommandEvent.class);
-        SlashCommandDefinition definition = SlashCommandDefinition.build(getBuildContext(method)).orElse(null);
+        SlashCommandDefinition definition = (SlashCommandDefinition) SlashCommandDefinition.build(getBuildContext(method)).orElse(null);
 
         assertNotNull(definition);
 
-        assertTrue(definition.hasCooldown());
-        assertEquals(10, definition.getCooldown().delay());
-        assertEquals(TimeUnit.MILLISECONDS, definition.getCooldown().timeUnit());
+        assertTrue(definition.cooldown().delay() > 0);
+        assertEquals(10, definition.cooldown().delay());
+        assertEquals(TimeUnit.MILLISECONDS, definition.cooldown().timeUnit());
     }
 
     @Test
     public void permission_oneString_ShouldWork() throws NoSuchMethodException {
         Method method = controller.getDeclaredMethod("permission", CommandEvent.class);
-        SlashCommandDefinition definition = SlashCommandDefinition.build(getBuildContext(method)).orElse(null);
+        SlashCommandDefinition definition = (SlashCommandDefinition) SlashCommandDefinition.build(getBuildContext(method)).orElse(null);
 
         assertNotNull(definition);
 
-        assertEquals(1, definition.getPermissions().size());
-        assertTrue(definition.getPermissions().contains("permission"));
+        assertEquals(1, definition.permissions().size());
+        assertTrue(definition.permissions().contains("permission"));
     }
 
 }
diff --git a/src/test/java/controller/ControllerDefinitionTestController.java b/src/test/java/controller/ControllerDefinitionTestController.java
deleted file mode 100644
index 472ce9fc7..000000000
--- a/src/test/java/controller/ControllerDefinitionTestController.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package controller;
-
-import com.github.kaktushose.jda.commands.annotations.interactions.Interaction;
-import com.github.kaktushose.jda.commands.annotations.interactions.SlashCommand;
-import com.github.kaktushose.jda.commands.annotations.interactions.Cooldown;
-import com.github.kaktushose.jda.commands.annotations.interactions.Permissions;
-import com.github.kaktushose.jda.commands.dispatching.events.interactions.CommandEvent;
-
-import java.util.concurrent.TimeUnit;
-
-@Interaction(value = "super")
-@Permissions("superPermission")
-@Cooldown(value = 10, timeUnit = TimeUnit.MILLISECONDS)
-public class ControllerDefinitionTestController {
-
-    @SlashCommand
-    public void adopt(CommandEvent event) {
-
-    }
-
-    @SlashCommand(value = "sub")
-    @Permissions("subPermission")
-    @Cooldown(value = 5, timeUnit = TimeUnit.DAYS)
-    public void combine(CommandEvent event) {
-
-    }
-
-    @SlashCommand("overload")
-    public void overloading(CommandEvent event) {
-
-    }
-
-    @SlashCommand("overload")
-    public void overloadingTwo(CommandEvent event) {
-
-    }
-
-}
diff --git a/src/test/java/controller/InteractionControllerDefinitionTest.java b/src/test/java/controller/InteractionControllerDefinitionTest.java
deleted file mode 100644
index 09c6f4738..000000000
--- a/src/test/java/controller/InteractionControllerDefinitionTest.java
+++ /dev/null
@@ -1,101 +0,0 @@
-package controller;
-
-import com.github.kaktushose.jda.commands.dependency.DefaultDependencyInjector;
-import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapterRegistry;
-import com.github.kaktushose.jda.commands.dispatching.events.interactions.CommandEvent;
-import com.github.kaktushose.jda.commands.dispatching.validation.ValidatorRegistry;
-import com.github.kaktushose.jda.commands.reflect.InteractionControllerDefinition;
-import com.github.kaktushose.jda.commands.reflect.interactions.commands.SlashCommandDefinition;
-import commands.UnsupportedType;
-import net.dv8tion.jda.api.interactions.commands.localization.LocalizationFunction;
-import net.dv8tion.jda.api.interactions.commands.localization.ResourceBundleLocalizationFunction;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
-
-import java.lang.reflect.Method;
-import java.util.concurrent.TimeUnit;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-public class InteractionControllerDefinitionTest {
-
-    private static final LocalizationFunction LOCALIZATION_FUNCTION = ResourceBundleLocalizationFunction.empty().build();
-    private static Class<?> controller;
-    private static ValidatorRegistry validators;
-    private static DefaultDependencyInjector dependencyInjector;
-
-    @BeforeAll
-    public static void setup() {
-        ControllerDefinitionTestController instance = new ControllerDefinitionTestController();
-        controller = instance.getClass();
-
-        validators = new ValidatorRegistry();
-
-        // make sure that this type is not registered before testing
-        TypeAdapterRegistry adapters = new TypeAdapterRegistry();
-        adapters.unregister(UnsupportedType.class);
-
-        dependencyInjector = new DefaultDependencyInjector();
-    }
-
-    @Test
-    public void command_NoValues_ShouldAdoptControllerValues() throws NoSuchMethodException {
-        Method method = controller.getDeclaredMethod("adopt", CommandEvent.class);
-
-        InteractionControllerDefinition controllerDefinition = InteractionControllerDefinition.build(
-                controller,
-                validators,
-                dependencyInjector,
-                LOCALIZATION_FUNCTION
-        );
-
-        assertNotNull(controllerDefinition);
-        SlashCommandDefinition definition = controllerDefinition.definitions().stream()
-                .filter(SlashCommandDefinition.class::isInstance)
-                .map(SlashCommandDefinition.class::cast)
-                .filter(c -> c.getMethod().equals(method))
-                .findFirst().orElse(null);
-        assertNotNull(definition);
-
-
-        assertTrue(definition.getName().contains("super"));
-
-        assertTrue(definition.hasCooldown());
-        assertEquals(10, definition.getCooldown().delay());
-        assertEquals(TimeUnit.MILLISECONDS, definition.getCooldown().timeUnit());
-
-        assertEquals(1, definition.getPermissions().size());
-        assertTrue(definition.getPermissions().contains("superPermission"));
-    }
-
-    @Test
-    public void command_OwnValues_ShouldCombineOrOverride() throws NoSuchMethodException {
-        Method method = controller.getDeclaredMethod("combine", CommandEvent.class);
-
-        InteractionControllerDefinition controllerDefinition = InteractionControllerDefinition.build(
-                controller,
-                validators,
-                dependencyInjector,
-                LOCALIZATION_FUNCTION
-        );
-
-        assertNotNull(controllerDefinition);
-        SlashCommandDefinition definition = controllerDefinition.definitions().stream()
-                .filter(SlashCommandDefinition.class::isInstance)
-                .map(SlashCommandDefinition.class::cast)
-                .filter(c -> c.getMethod().equals(method))
-                .findFirst().orElse(null);
-        assertNotNull(definition);
-
-        assertEquals("super sub", definition.getName());
-
-        assertTrue(definition.hasCooldown());
-        assertEquals(5, definition.getCooldown().delay());
-        assertEquals(TimeUnit.DAYS, definition.getCooldown().timeUnit());
-
-        assertEquals(2, definition.getPermissions().size());
-        assertTrue(definition.getPermissions().contains("superPermission"));
-        assertTrue(definition.getPermissions().contains("subPermission"));
-    }
-
-}
diff --git a/src/test/java/parameters/ParameterDefinitionTest.java b/src/test/java/parameters/ParameterDefinitionTest.java
index 1f365390a..af5a6393b 100644
--- a/src/test/java/parameters/ParameterDefinitionTest.java
+++ b/src/test/java/parameters/ParameterDefinitionTest.java
@@ -1,13 +1,18 @@
 package parameters;
 
 import com.github.kaktushose.jda.commands.annotations.constraints.Min;
+import com.github.kaktushose.jda.commands.definitions.description.ParameterDescription;
+import com.github.kaktushose.jda.commands.definitions.interactions.command.ParameterDefinition;
 import com.github.kaktushose.jda.commands.dispatching.validation.ValidatorRegistry;
 import com.github.kaktushose.jda.commands.dispatching.validation.impl.MinimumValidator;
-import com.github.kaktushose.jda.commands.reflect.ParameterDefinition;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
 import java.lang.reflect.Method;
+import java.lang.reflect.Parameter;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
 
 import static org.junit.jupiter.api.Assertions.*;
 
@@ -22,56 +27,54 @@ public static void setup() {
         validatorRegistry = new ValidatorRegistry();
     }
 
-    @Test
-    public void method_withVarArgs_ShouldThrow() throws NoSuchMethodException {
-        Method method = controller.getDeclaredMethod("varArgs", Object[].class);
-
-        assertThrows(IllegalArgumentException.class, () -> ParameterDefinition.build(method.getParameters()[0], validatorRegistry));
+    private static ParameterDescription parameter(Parameter parameter) {
+        return new ParameterDescription(
+                parameter.getType(),
+                parameter.getName(),
+                toList(parameter.getAnnotations())
+        );
     }
 
-    @Test
-    public void method_withPrimitiveInt_ShouldWrap() throws NoSuchMethodException {
-        Method method = controller.getDeclaredMethod("primitives", int.class);
-        ParameterDefinition parameter = ParameterDefinition.build(method.getParameters()[0], validatorRegistry);
-
-        assertEquals(Integer.class, parameter.type());
-        assertTrue(parameter.isPrimitive());
+    private static <T> Collection<T> toList(T[] array) {
+        return Arrays.stream(array).toList();
     }
 
     @Test
     public void optional_withoutDefault_ShouldBeNull() throws NoSuchMethodException {
         Method method = controller.getDeclaredMethod("optional", Object.class);
-        ParameterDefinition parameter = ParameterDefinition.build(method.getParameters()[0], validatorRegistry);
+        ParameterDefinition parameter = ParameterDefinition.build(parameter(method.getParameters()[0]), false, validatorRegistry);
 
-        assertTrue(parameter.isOptional());
+        assertTrue(parameter.optional());
         assertNull(parameter.defaultValue());
     }
 
     @Test
     public void optional_withDefault_ShouldWork() throws NoSuchMethodException {
         Method method = controller.getDeclaredMethod("optionalWithDefault", Object.class);
-        ParameterDefinition parameter = ParameterDefinition.build(method.getParameters()[0], validatorRegistry);
+        ParameterDefinition parameter = ParameterDefinition.build(parameter(method.getParameters()[0]), false, validatorRegistry);
 
-        assertTrue(parameter.isOptional());
+        assertTrue(parameter.optional());
         assertEquals("default", parameter.defaultValue());
     }
 
     @Test
     public void constraintMin_withLimit10_ShouldWork() throws NoSuchMethodException {
         Method method = controller.getDeclaredMethod("constraint", int.class);
-        ParameterDefinition parameter = ParameterDefinition.build(method.getParameters()[0], validatorRegistry);
+        ParameterDefinition parameter = ParameterDefinition.build(parameter(method.getParameters()[0]), false, validatorRegistry);
 
+        var constraints = List.copyOf(parameter.constraints());
         assertEquals(1, parameter.constraints().size());
-        assertEquals(10, ((Min) parameter.constraints().get(0).annotation()).value());
-        assertEquals(MinimumValidator.class, parameter.constraints().get(0).validator().getClass());
-        assertFalse(parameter.constraints().get(0).message().isEmpty());
+        assertEquals(10, ((Min) constraints.get(0).annotation()).value());
+        assertEquals(MinimumValidator.class, constraints.get(0).validator().getClass());
+        assertFalse(constraints.get(0).message().isEmpty());
     }
 
     @Test
     public void constraint_withMessage_ShouldWork() throws NoSuchMethodException {
         Method method = controller.getDeclaredMethod("constraintWithMessage", int.class);
-        ParameterDefinition parameter = ParameterDefinition.build(method.getParameters()[0], validatorRegistry);
+        ParameterDefinition parameter = ParameterDefinition.build(parameter(method.getParameters()[0]), false, validatorRegistry);
+        var constraints = List.copyOf(parameter.constraints());
 
-        assertEquals("error message", parameter.constraints().get(0).message());
+        assertEquals("error message", constraints.getFirst().message());
     }
 }
diff --git a/src/test/java/parameters/ParameterTestController.java b/src/test/java/parameters/ParameterTestController.java
index dfe743c72..221964b1a 100644
--- a/src/test/java/parameters/ParameterTestController.java
+++ b/src/test/java/parameters/ParameterTestController.java
@@ -9,10 +9,6 @@ public void varArgs(Object... args) {
 
     }
 
-    public void primitives(int i) {
-
-    }
-
     public void optional(@Optional Object argument) {
 
     }

From df9794ef93a8904e318231635e82a4f4e76bcb58 Mon Sep 17 00:00:00 2001
From: Kaktushose <42280757+Kaktushose@users.noreply.github.com>
Date: Sun, 5 Jan 2025 17:56:11 +0100
Subject: [PATCH 16/38] add common ErrorContext for error messages

---
 .../dispatching/JDAEventListener.java         |  2 +-
 .../context/InvocationContext.java            | 14 +++---
 .../dispatching/handling/EventHandler.java    |  2 +-
 .../handling/command/SlashCommandHandler.java |  3 +-
 .../middleware/impl/ConstraintMiddleware.java |  2 +-
 .../middleware/impl/CooldownMiddleware.java   |  2 +-
 .../impl/PermissionsMiddleware.java           |  2 +-
 .../error/DefaultErrorMessageFactory.java     | 27 +++++-------
 .../embeds/error/ErrorMessageFactory.java     | 44 ++++++++++++-------
 .../embeds/error/JsonErrorMessageFactory.java | 41 ++++++++---------
 .../jda/commands/internal/Helpers.java        | 19 ++++++++
 11 files changed, 94 insertions(+), 64 deletions(-)

diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/JDAEventListener.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/JDAEventListener.java
index eb8619485..b99ed8fcc 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/JDAEventListener.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/JDAEventListener.java
@@ -55,7 +55,7 @@ public void onGenericInteractionCreate(@NotNull GenericInteractionCreateEvent jd
                 componentEvent.deferEdit().setComponents().queue();
                 componentEvent.getHook()
                         .setEphemeral(true)
-                        .sendMessage(context.implementationRegistry().getErrorMessageFactory().getTimedOutComponentMessage())
+                        .sendMessage(context.implementationRegistry().getErrorMessageFactory().getTimedOutComponentMessage(jdaEvent))
                         .queue();
             } else {
                 log.debug("Received unknown event: {}", jdaEvent);
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/context/InvocationContext.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/context/InvocationContext.java
index 1fef49ef4..e4a30bb7d 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/context/InvocationContext.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/context/InvocationContext.java
@@ -3,8 +3,10 @@
 import com.github.kaktushose.jda.commands.definitions.features.internal.Invokable;
 import com.github.kaktushose.jda.commands.definitions.interactions.InteractionDefinition;
 import com.github.kaktushose.jda.commands.dispatching.reply.MessageReply;
+import com.github.kaktushose.jda.commands.embeds.error.ErrorMessageFactory.ErrorContext;
 import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent;
 import net.dv8tion.jda.api.utils.messages.MessageCreateData;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.SequencedCollection;
 
@@ -16,16 +18,16 @@
 /// @param arguments     the arguments used to call the final user defined method via [Invokable#invoke(java.lang.Object, com.github.kaktushose.jda.commands.dispatching.context.InvocationContext)]
 /// @param definition    the [InteractionDefinition] defining this interaction (referring to the user defined method)
 public record InvocationContext<T extends GenericInteractionCreateEvent>(
-        T event,
-        KeyValueStore keyValueStore,
-        InteractionDefinition definition,
-        SequencedCollection<Object> arguments
-) {
+        @NotNull T event,
+        @NotNull KeyValueStore keyValueStore,
+        @NotNull InteractionDefinition definition,
+        @NotNull SequencedCollection<Object> arguments
+) implements ErrorContext {
     /// Stops further execution of this invocation at the next suitable moment.
     ///
     /// @param errorMessage the error message that should be sent to the user as a reply
     /// @implNote This will interrupt the current event thread
-    public void cancel(MessageCreateData errorMessage) {
+    public void cancel(@NotNull MessageCreateData errorMessage) {
         new MessageReply(event, definition, new InteractionDefinition.ReplyConfig()).reply(errorMessage);
 
         Thread.currentThread().interrupt();
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/EventHandler.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/EventHandler.java
index 3b3d1175e..84576f9ad 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/EventHandler.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/EventHandler.java
@@ -105,7 +105,7 @@ private void invoke(@NotNull InvocationContext<T> invocation, @NotNull Runtime r
             log.error("Interaction execution failed!", exception);
             // this unwraps the underlying error in case of an exception inside the command class
             Throwable throwable = exception instanceof InvocationTargetException ? exception.getCause() : exception;
-            invocation.cancel(implementationRegistry.getErrorMessageFactory().getCommandExecutionFailedMessage(invocation.event(), throwable));
+            invocation.cancel(implementationRegistry.getErrorMessageFactory().getCommandExecutionFailedMessage(invocation, throwable));
         }
     }
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/command/SlashCommandHandler.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/command/SlashCommandHandler.java
index f13135fb3..dd85911e8 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/command/SlashCommandHandler.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/command/SlashCommandHandler.java
@@ -10,6 +10,7 @@
 import com.github.kaktushose.jda.commands.dispatching.handling.EventHandler;
 import com.github.kaktushose.jda.commands.dispatching.reply.MessageReply;
 import com.github.kaktushose.jda.commands.embeds.error.ErrorMessageFactory;
+import com.github.kaktushose.jda.commands.internal.Helpers;
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
@@ -94,7 +95,7 @@ private Optional<List<Object>> parseArguments(SlashCommandDefinition command, Sl
             if (parsed.isEmpty()) {
                 log.debug("Type adapting failed!");
                 new MessageReply(event, command).reply(
-                        messageFactory.getTypeAdaptingFailedMessage(event, command, Arrays.asList(input))
+                        messageFactory.getTypeAdaptingFailedMessage(Helpers.errorContext(event, command), Arrays.asList(input))
                 );
                 return Optional.empty();
             }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/ConstraintMiddleware.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/ConstraintMiddleware.java
index d28587235..1c066c347 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/ConstraintMiddleware.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/ConstraintMiddleware.java
@@ -51,7 +51,7 @@ public void accept(@NotNull InvocationContext<?> context) {
                     context.cancel(
                             implementationRegistry
                                     .getErrorMessageFactory()
-                                    .getConstraintFailedMessage(constraint)
+                                    .getConstraintFailedMessage(context, constraint)
                     );
                     log.debug("Constraint failed!");
                     return;
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/CooldownMiddleware.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/CooldownMiddleware.java
index 13d9a3818..81a6f7aa3 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/CooldownMiddleware.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/CooldownMiddleware.java
@@ -54,7 +54,7 @@ public void accept(@NotNull InvocationContext<?> context) {
             if (remaining <= 0) {
                 activeCooldowns.get(id).remove(entry);
             } else {
-                context.cancel(implementationRegistry.getErrorMessageFactory().getCooldownMessage(remaining));
+                context.cancel(implementationRegistry.getErrorMessageFactory().getCooldownMessage(context, remaining));
                 log.debug("Command has a remaining cooldown of {} ms!", remaining);
                 return;
             }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/PermissionsMiddleware.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/PermissionsMiddleware.java
index 2908691f7..047dba263 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/PermissionsMiddleware.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/PermissionsMiddleware.java
@@ -48,7 +48,7 @@ public void accept(@NotNull InvocationContext<?> context) {
             hasPerms = provider.hasPermission(event.getUser(), context);
         }
         if (!hasPerms) {
-            context.cancel(implementationRegistry.getErrorMessageFactory().getInsufficientPermissionsMessage(context.definition()));
+            context.cancel(implementationRegistry.getErrorMessageFactory().getInsufficientPermissionsMessage(context));
             log.debug("Insufficient permissions!");
             return;
         }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/embeds/error/DefaultErrorMessageFactory.java b/src/main/java/com/github/kaktushose/jda/commands/embeds/error/DefaultErrorMessageFactory.java
index 961c4e908..75e33bac6 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/embeds/error/DefaultErrorMessageFactory.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/embeds/error/DefaultErrorMessageFactory.java
@@ -1,6 +1,5 @@
 package com.github.kaktushose.jda.commands.embeds.error;
 
-import com.github.kaktushose.jda.commands.definitions.interactions.InteractionDefinition;
 import com.github.kaktushose.jda.commands.definitions.interactions.command.ParameterDefinition;
 import com.github.kaktushose.jda.commands.definitions.interactions.command.SlashCommandDefinition;
 import com.github.kaktushose.jda.commands.dispatching.events.interactions.CommandEvent;
@@ -23,11 +22,9 @@ public class DefaultErrorMessageFactory implements ErrorMessageFactory {
 
     @NotNull
     @Override
-    public MessageCreateData getTypeAdaptingFailedMessage(@NotNull GenericInteractionCreateEvent event,
-                                                          @NotNull InteractionDefinition definition,
-                                                          @NotNull List<String> userInput) {
+    public MessageCreateData getTypeAdaptingFailedMessage(@NotNull ErrorContext context, @NotNull List<String> userInput) {
         StringBuilder sbExpected = new StringBuilder();
-        SlashCommandDefinition command = (SlashCommandDefinition) definition;
+        SlashCommandDefinition command = (SlashCommandDefinition) context.definition();
 
         command.commandParameters().forEach(parameter -> {
             if (CommandEvent.class.isAssignableFrom(parameter.type())) {
@@ -58,15 +55,15 @@ public MessageCreateData getTypeAdaptingFailedMessage(@NotNull GenericInteractio
 
     @NotNull
     @Override
-    public MessageCreateData getInsufficientPermissionsMessage(@NotNull InteractionDefinition interaction) {
+    public MessageCreateData getInsufficientPermissionsMessage(@NotNull ErrorContext context) {
         StringBuilder sbPermissions = new StringBuilder();
-        interaction.permissions().forEach(permission -> sbPermissions.append(permission).append(", "));
+        context.definition().permissions().forEach(permission -> sbPermissions.append(permission).append(", "));
         String permissions = sbPermissions.toString().isEmpty() ? "N/A" : sbPermissions.substring(0, sbPermissions.length() - 2);
         MessageEmbed embed = new EmbedBuilder()
                 .setColor(Color.RED)
                 .setTitle("Insufficient Permissions")
                 .setDescription(String.format("`%s` requires specific permissions to be executed",
-                        interaction.displayName()))
+                        context.definition().displayName()))
                 .addField("Permissions:",
                         String.format("`%s`", permissions), false
                 ).build();
@@ -75,7 +72,7 @@ public MessageCreateData getInsufficientPermissionsMessage(@NotNull InteractionD
 
     @NotNull
     @Override
-    public MessageCreateData getConstraintFailedMessage(@NotNull ParameterDefinition.ConstraintDefinition constraint) {
+    public MessageCreateData getConstraintFailedMessage(@NotNull ErrorContext context, @NotNull ParameterDefinition.ConstraintDefinition constraint) {
         return new MessageCreateBuilder().setEmbeds(new EmbedBuilder()
                 .setColor(Color.ORANGE)
                 .setTitle("Parameter Error")
@@ -86,7 +83,7 @@ public MessageCreateData getConstraintFailedMessage(@NotNull ParameterDefinition
 
     @NotNull
     @Override
-    public MessageCreateData getCooldownMessage(long ms) {
+    public MessageCreateData getCooldownMessage(@NotNull ErrorContext context, long ms) {
         long secs = TimeUnit.MILLISECONDS.toSeconds(ms);
         long seconds = secs % 60;
         long minutes = (secs / 60) % 60;
@@ -118,7 +115,7 @@ public MessageCreateData getCooldownMessage(long ms) {
 
     @NotNull
     @Override
-    public MessageCreateData getWrongChannelTypeMessage() {
+    public MessageCreateData getWrongChannelTypeMessage(@NotNull ErrorContext context) {
         return new MessageCreateBuilder().setEmbeds(new EmbedBuilder()
                 .setColor(Color.RED)
                 .setTitle("Wrong Channel Type")
@@ -129,14 +126,14 @@ public MessageCreateData getWrongChannelTypeMessage() {
 
     @NotNull
     @Override
-    public MessageCreateData getCommandExecutionFailedMessage(@NotNull GenericInteractionCreateEvent event, @NotNull Throwable exception) {
+    public MessageCreateData getCommandExecutionFailedMessage(@NotNull ErrorContext context, @NotNull Throwable exception) {
         String error;
 
         error = String.format("```The user \"%s\" attempted to execute an \"%s\" interaction at %s, " +
                         "but a \"%s\" occurred. " +
                         "Please refer to the logs for further information.```",
-                event.getUser(),
-                event.getInteraction().getType(),
+                context.event().getUser(),
+                context.event().getInteraction().getType(),
                 new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(System.currentTimeMillis()),
                 exception.getClass().getName()
         );
@@ -152,7 +149,7 @@ public MessageCreateData getCommandExecutionFailedMessage(@NotNull GenericIntera
 
     @NotNull
     @Override
-    public MessageCreateData getTimedOutComponentMessage() {
+    public MessageCreateData getTimedOutComponentMessage(@NotNull GenericInteractionCreateEvent context) {
         return new MessageCreateBuilder().setEmbeds(new EmbedBuilder()
                 .setColor(Color.RED)
                 .setTitle("Unknown Interaction")
diff --git a/src/main/java/com/github/kaktushose/jda/commands/embeds/error/ErrorMessageFactory.java b/src/main/java/com/github/kaktushose/jda/commands/embeds/error/ErrorMessageFactory.java
index 763224044..4141de9d2 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/embeds/error/ErrorMessageFactory.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/embeds/error/ErrorMessageFactory.java
@@ -18,54 +18,68 @@ public interface ErrorMessageFactory {
 
     /// Gets a [MessageCreateData] to send when type adapting of the user input failed.
     ///
-    /// @param event      the [GenericInteractionCreateEvent] that was attempted to type adapt
-    /// @param definition the underlying [InteractionDefinition]
-    /// @param userInput  the input the user provided
+    /// @param context   the [ErrorContext]
+    /// @param userInput the input the user provided
     /// @return a [MessageCreateData] to send when type adapting failed
     @NotNull
-    MessageCreateData getTypeAdaptingFailedMessage(@NotNull GenericInteractionCreateEvent event,
-                                                   @NotNull InteractionDefinition definition,
-                                                   @NotNull List<String> userInput);
+    MessageCreateData getTypeAdaptingFailedMessage(@NotNull ErrorContext context, @NotNull List<String> userInput);
 
     /// Gets a [MessageCreateData] to send when a user is missing permissions.
     ///
-    /// @param definition the corresponding [InteractionDefinition]
+    /// @param context the [ErrorContext]
     /// @return a [MessageCreateData] to send when a user is missing permissions
     @NotNull
-    MessageCreateData getInsufficientPermissionsMessage(@NotNull InteractionDefinition definition);
+    MessageCreateData getInsufficientPermissionsMessage(@NotNull ErrorContext context);
 
     /// Gets a [MessageCreateData] to send when a parameter constraint fails.
     ///
+    /// @param context    the [ErrorContext]
     /// @param constraint the corresponding [ConstraintDefinition] that failed
     /// @return a [MessageCreateData] to send when a parameter constraint fails
     @NotNull
-    MessageCreateData getConstraintFailedMessage(@NotNull ConstraintDefinition constraint);
+    MessageCreateData getConstraintFailedMessage(@NotNull ErrorContext context, @NotNull ConstraintDefinition constraint);
 
     /// Gets a [Message] to send when a command still has a cooldown.
     ///
-    /// @param ms the remaining cooldown in milliseconds
+    /// @param context the [ErrorContext]
+    /// @param ms      the remaining cooldown in milliseconds
     /// @return a [MessageCreateData] to send when a command still has a cooldown
     @NotNull
-    MessageCreateData getCooldownMessage(long ms);
+    MessageCreateData getCooldownMessage(@NotNull ErrorContext context, long ms);
 
     /// Gets a [MessageCreateData] to send when the channel type isn't suitable for the command.
     ///
+    /// @param context the [ErrorContext]
     /// @return a [MessageCreateData] to send when the channel type isn't suitable for the command
     @NotNull
-    MessageCreateData getWrongChannelTypeMessage();
+    MessageCreateData getWrongChannelTypeMessage(@NotNull ErrorContext context);
 
     /// Gets a [MessageCreateData] to send when the command execution failed.
     ///
-    /// @param event     the corresponding [GenericInteractionCreateEvent]
+    /// @param context   the [ErrorContext]
     /// @param exception the [Throwable] that made the command execution fail
     /// @return a [MessageCreateData] to send when the command execution failed
     @NotNull
-    MessageCreateData getCommandExecutionFailedMessage(@NotNull GenericInteractionCreateEvent event, @NotNull Throwable exception);
+    MessageCreateData getCommandExecutionFailedMessage(@NotNull ErrorContext context, @NotNull Throwable exception);
 
     /// Gets a [MessageCreateData] to send when an incoming component interaction already timed out.
     ///
+    /// @param event the [GenericInteractionCreateEvent] mo runtime was found for
     /// @return a [MessageCreateData] to send when an incoming component interaction already timed out
     @NotNull
-    MessageCreateData getTimedOutComponentMessage();
+    MessageCreateData getTimedOutComponentMessage(@NotNull GenericInteractionCreateEvent event);
+
+    /// Holds the respective [GenericInteractionCreateEvent] and [InteractionDefinition] of an error.
+    interface ErrorContext {
+
+        /// The [GenericInteractionCreateEvent] in whose execution the error occurred.
+        @NotNull
+        GenericInteractionCreateEvent event();
+
+        /// The [InteractionDefinition] that models the interaction of the [#event].
+        @NotNull
+        InteractionDefinition definition();
+
+    }
 
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/embeds/error/JsonErrorMessageFactory.java b/src/main/java/com/github/kaktushose/jda/commands/embeds/error/JsonErrorMessageFactory.java
index eac74993f..a3f1daed1 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/embeds/error/JsonErrorMessageFactory.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/embeds/error/JsonErrorMessageFactory.java
@@ -1,6 +1,5 @@
 package com.github.kaktushose.jda.commands.embeds.error;
 
-import com.github.kaktushose.jda.commands.definitions.interactions.InteractionDefinition;
 import com.github.kaktushose.jda.commands.definitions.interactions.command.ParameterDefinition;
 import com.github.kaktushose.jda.commands.definitions.interactions.command.SlashCommandDefinition;
 import com.github.kaktushose.jda.commands.dispatching.events.interactions.CommandEvent;
@@ -27,15 +26,13 @@ public JsonErrorMessageFactory(EmbedCache embedCache) {
 
     @NotNull
     @Override
-    public MessageCreateData getTypeAdaptingFailedMessage(@NotNull GenericInteractionCreateEvent event,
-                                                          @NotNull InteractionDefinition definition,
-                                                          @NotNull List<String> userInput) {
+    public MessageCreateData getTypeAdaptingFailedMessage(@NotNull ErrorContext context, @NotNull List<String> userInput) {
         if (!embedCache.containsEmbed("typeAdaptingFailed")) {
-            return super.getTypeAdaptingFailedMessage(event, definition, userInput);
+            return super.getTypeAdaptingFailedMessage(context, userInput);
         }
 
         StringBuilder sbExpected = new StringBuilder();
-        SlashCommandDefinition command = (SlashCommandDefinition) definition;
+        SlashCommandDefinition command = (SlashCommandDefinition) context.definition();
 
         command.commandParameters().forEach(parameter -> {
             if (CommandEvent.class.isAssignableFrom(parameter.type())) {
@@ -62,26 +59,26 @@ public MessageCreateData getTypeAdaptingFailedMessage(@NotNull GenericInteractio
 
     @NotNull
     @Override
-    public MessageCreateData getInsufficientPermissionsMessage(@NotNull InteractionDefinition interaction) {
+    public MessageCreateData getInsufficientPermissionsMessage(@NotNull ErrorContext context) {
         if (!embedCache.containsEmbed("insufficientPermissions")) {
-            return super.getInsufficientPermissionsMessage(interaction);
+            return super.getInsufficientPermissionsMessage(context);
         }
 
         StringBuilder sbPermissions = new StringBuilder();
-        interaction.permissions().forEach(permission -> sbPermissions.append(permission).append(", "));
+        context.definition().permissions().forEach(permission -> sbPermissions.append(permission).append(", "));
         String permissions = sbPermissions.toString().isEmpty() ? "N/A" : sbPermissions.substring(0, sbPermissions.length() - 2);
 
         return embedCache.getEmbed("insufficientPermissions")
-                .injectValue("name", interaction.displayName())
+                .injectValue("name", context.definition().displayName())
                 .injectValue("permissions", permissions)
                 .toMessageCreateData();
     }
 
     @NotNull
     @Override
-    public MessageCreateData getConstraintFailedMessage(@NotNull ParameterDefinition.ConstraintDefinition constraint) {
+    public MessageCreateData getConstraintFailedMessage(@NotNull ErrorContext context, @NotNull ParameterDefinition.ConstraintDefinition constraint) {
         if (!embedCache.containsEmbed("constraintFailed")) {
-            return super.getConstraintFailedMessage(constraint);
+            return super.getConstraintFailedMessage(context, constraint);
         }
         return embedCache.getEmbed("constraintFailed")
                 .injectValue("message", constraint.message())
@@ -90,9 +87,9 @@ public MessageCreateData getConstraintFailedMessage(@NotNull ParameterDefinition
 
     @NotNull
     @Override
-    public MessageCreateData getCooldownMessage(long ms) {
+    public MessageCreateData getCooldownMessage(@NotNull ErrorContext context, long ms) {
         if (!embedCache.containsEmbed("cooldown")) {
-            return super.getCooldownMessage(ms);
+            return super.getCooldownMessage(context, ms);
         }
         long seconds = TimeUnit.MILLISECONDS.toSeconds(ms);
         long s = seconds % 60;
@@ -107,24 +104,24 @@ public MessageCreateData getCooldownMessage(long ms) {
 
     @NotNull
     @Override
-    public MessageCreateData getWrongChannelTypeMessage() {
+    public MessageCreateData getWrongChannelTypeMessage(@NotNull ErrorContext context) {
         if (!embedCache.containsEmbed("wrongChannel")) {
-            return super.getWrongChannelTypeMessage();
+            return super.getWrongChannelTypeMessage(context);
         }
         return embedCache.getEmbed("wrongChannel").toMessageCreateData();
     }
 
     @NotNull
     @Override
-    public MessageCreateData getCommandExecutionFailedMessage(@NotNull GenericInteractionCreateEvent event, @NotNull Throwable exception) {
+    public MessageCreateData getCommandExecutionFailedMessage(@NotNull ErrorContext context, @NotNull Throwable exception) {
         if (!embedCache.containsEmbed("executionFailed")) {
-            return super.getCommandExecutionFailedMessage(event, exception);
+            return super.getCommandExecutionFailedMessage(context, exception);
         }
         String error = String.format("```The user \"%s\" attempted to execute an \"%s\" interaction at %s, " +
                         "but a \"%s\" occurred. " +
                         "Please refer to the logs for further information.```",
-                event.getUser(),
-                event.getInteraction().getType(),
+                context.event().getUser(),
+                context.event().getInteraction().getType(),
                 new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(System.currentTimeMillis()),
                 exception.getClass().getName()
         );
@@ -135,9 +132,9 @@ public MessageCreateData getCommandExecutionFailedMessage(@NotNull GenericIntera
 
     @NotNull
     @Override
-    public MessageCreateData getTimedOutComponentMessage() {
+    public MessageCreateData getTimedOutComponentMessage(@NotNull GenericInteractionCreateEvent event) {
         if (!embedCache.containsEmbed("unknownInteraction")) {
-            return super.getTimedOutComponentMessage();
+            return super.getTimedOutComponentMessage(event);
         }
         return embedCache.getEmbed("unknownInteraction").toMessageCreateData();
     }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/internal/Helpers.java b/src/main/java/com/github/kaktushose/jda/commands/internal/Helpers.java
index d5f1135a1..531a7516a 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/internal/Helpers.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/internal/Helpers.java
@@ -7,6 +7,7 @@
 import com.github.kaktushose.jda.commands.definitions.interactions.InteractionDefinition;
 import com.github.kaktushose.jda.commands.definitions.interactions.MethodBuildContext;
 import com.github.kaktushose.jda.commands.dispatching.reply.GlobalReplyConfig;
+import com.github.kaktushose.jda.commands.embeds.error.ErrorMessageFactory.ErrorContext;
 import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.channel.middleman.GuildChannel;
 import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent;
@@ -132,4 +133,22 @@ public static boolean checkSignature(MethodDescription method, Collection<Class<
         }
         return false;
     }
+
+    @NotNull
+    public static ErrorContext errorContext(@NotNull GenericInteractionCreateEvent event, @NotNull InteractionDefinition definition) {
+        return new ErrorContext() {
+
+            @NotNull
+            @Override
+            public GenericInteractionCreateEvent event() {
+                return event;
+            }
+
+            @NotNull
+            @Override
+            public InteractionDefinition definition() {
+                return definition;
+            }
+        };
+    }
 }

From 177c4e3e7c9c438cb74e2f908405134dcafb9925 Mon Sep 17 00:00:00 2001
From: Kaktushose <42280757+Kaktushose@users.noreply.github.com>
Date: Sun, 5 Jan 2025 18:55:15 +0100
Subject: [PATCH 17/38] rename ParameterDefinition to OptionDataDefinition and
 fix bug in ConstraintMiddleware

---
 .../jda/commands/definitions/Definition.java  |  4 +--
 .../definitions/features/JDAEntity.java       |  6 ++--
 .../interactions/ModalDefinition.java         |  5 ++-
 ...inition.java => OptionDataDefinition.java} | 16 +++++-----
 .../command/SlashCommandDefinition.java       | 18 +++++------
 .../handling/command/SlashCommandHandler.java | 14 ++++----
 .../middleware/impl/ConstraintMiddleware.java | 32 +++++++------------
 .../error/DefaultErrorMessageFactory.java     |  6 ++--
 .../embeds/error/ErrorMessageFactory.java     |  2 +-
 .../embeds/error/JsonErrorMessageFactory.java |  6 ++--
 .../jda/commands/internal/Helpers.java        |  2 +-
 .../commands/SlashCommandDefinitionTest.java  | 14 ++++----
 12 files changed, 58 insertions(+), 67 deletions(-)
 rename src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/{ParameterDefinition.java => OptionDataDefinition.java} (96%)

diff --git a/src/main/java/com/github/kaktushose/jda/commands/definitions/Definition.java b/src/main/java/com/github/kaktushose/jda/commands/definitions/Definition.java
index a1ec7cca8..354698689 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/definitions/Definition.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/definitions/Definition.java
@@ -5,14 +5,14 @@
 import com.github.kaktushose.jda.commands.definitions.features.internal.Invokable;
 import com.github.kaktushose.jda.commands.definitions.interactions.InteractionDefinition;
 import com.github.kaktushose.jda.commands.definitions.interactions.ModalDefinition;
-import com.github.kaktushose.jda.commands.definitions.interactions.command.ParameterDefinition;
+import com.github.kaktushose.jda.commands.definitions.interactions.command.OptionDataDefinition;
 import com.github.kaktushose.jda.commands.definitions.interactions.command.SlashCommandDefinition;
 import com.github.kaktushose.jda.commands.definitions.interactions.component.menu.StringSelectMenuDefinition;
 import org.jetbrains.annotations.NotNull;
 
 /// The common interface for all interaction definitions and their sub parts, such as parameters or text inputs, etc.
 public sealed interface Definition permits CustomIdJDAEntity, Invokable, JDAEntity, InteractionDefinition,
-        ModalDefinition.TextInputDefinition, ParameterDefinition, ParameterDefinition.ConstraintDefinition,
+        ModalDefinition.TextInputDefinition, OptionDataDefinition, OptionDataDefinition.ConstraintDefinition,
         SlashCommandDefinition.CooldownDefinition, StringSelectMenuDefinition.SelectOptionDefinition {
 
     /// The id for this definition. Per default this is the hash code of the [#toString()] method.
diff --git a/src/main/java/com/github/kaktushose/jda/commands/definitions/features/JDAEntity.java b/src/main/java/com/github/kaktushose/jda/commands/definitions/features/JDAEntity.java
index dd2fd6202..9ad1376ea 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/definitions/features/JDAEntity.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/definitions/features/JDAEntity.java
@@ -4,7 +4,7 @@
 import com.github.kaktushose.jda.commands.definitions.interactions.ModalDefinition.TextInputDefinition;
 import com.github.kaktushose.jda.commands.definitions.interactions.command.CommandDefinition;
 import com.github.kaktushose.jda.commands.definitions.interactions.command.ContextCommandDefinition;
-import com.github.kaktushose.jda.commands.definitions.interactions.command.ParameterDefinition;
+import com.github.kaktushose.jda.commands.definitions.interactions.command.OptionDataDefinition;
 import com.github.kaktushose.jda.commands.definitions.interactions.command.SlashCommandDefinition;
 import com.github.kaktushose.jda.commands.definitions.interactions.component.ButtonDefinition;
 import com.github.kaktushose.jda.commands.definitions.interactions.component.ComponentDefinition;
@@ -20,11 +20,11 @@
 /// @see StringSelectMenuDefinition
 /// @see SlashCommandDefinition
 /// @see ContextCommandDefinition
-/// @see ParameterDefinition
+/// @see OptionDataDefinition
 /// @see SelectOptionDefinition
 /// @see TextInputDefinition
 public sealed interface JDAEntity<T> extends Definition
-        permits ComponentDefinition, TextInputDefinition, CommandDefinition, ParameterDefinition, SelectOptionDefinition {
+        permits ComponentDefinition, TextInputDefinition, CommandDefinition, OptionDataDefinition, SelectOptionDefinition {
 
     /// Transforms this [Definition] into a JDA entity of the given type [T].
     ///
diff --git a/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/ModalDefinition.java b/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/ModalDefinition.java
index dc95bc45c..d653aa334 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/ModalDefinition.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/ModalDefinition.java
@@ -6,7 +6,6 @@
 import com.github.kaktushose.jda.commands.definitions.description.ParameterDescription;
 import com.github.kaktushose.jda.commands.definitions.features.CustomIdJDAEntity;
 import com.github.kaktushose.jda.commands.definitions.features.JDAEntity;
-import com.github.kaktushose.jda.commands.definitions.interactions.command.ParameterDefinition;
 import com.github.kaktushose.jda.commands.dispatching.events.interactions.ModalEvent;
 import com.github.kaktushose.jda.commands.internal.Helpers;
 import net.dv8tion.jda.api.interactions.components.text.TextInput;
@@ -108,9 +107,9 @@ public record TextInputDefinition(
             boolean required
     ) implements JDAEntity<TextInput>, Definition {
 
-        /// Builds a new [TextInputDefinition] from the given [ParameterDefinition]
+        /// Builds a new [TextInputDefinition] from the given [ParameterDescription]
         ///
-        /// @param parameter the [ParameterDefinition] to build the [TextInputDefinition] from
+        /// @param parameter the [ParameterDescription] to build the [TextInputDefinition] from
         /// @return the new [TextInputDefinition]
         public static Optional<TextInputDefinition> build(ParameterDescription parameter) {
             var optional = parameter.annotation(com.github.kaktushose.jda.commands.annotations.interactions.TextInput.class);
diff --git a/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/ParameterDefinition.java b/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/OptionDataDefinition.java
similarity index 96%
rename from src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/ParameterDefinition.java
rename to src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/OptionDataDefinition.java
index 0aa4e7953..3e7402c79 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/ParameterDefinition.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/OptionDataDefinition.java
@@ -42,7 +42,7 @@
 /// @param description  the description of the parameter
 /// @param choices      a [SequencedCollection] of possible [Command.Choice]s for this parameter
 /// @param constraints  a [Collection] of [ConstraintDefinition]s of this parameter
-public record ParameterDefinition(
+public record OptionDataDefinition(
         @NotNull Class<?> type,
         boolean optional,
         boolean autoComplete,
@@ -103,16 +103,16 @@ public record ParameterDefinition(
             ))
     );
 
-    /// Builds a new [ParameterDefinition].
+    /// Builds a new [OptionDataDefinition].
     ///
-    /// @param parameter         the [ParameterDescription] to build the [ParameterDefinition] from
+    /// @param parameter         the [ParameterDescription] to build the [OptionDataDefinition] from
     /// @param autoComplete      whether the [ParameterDescription] should support autocomplete
     /// @param validatorRegistry the corresponding [ValidatorRegistry]
-    /// @return the [ParameterDefinition]
+    /// @return the [OptionDataDefinition]
     @NotNull
-    public static ParameterDefinition build(ParameterDescription parameter,
-                                            boolean autoComplete,
-                                            @NotNull ValidatorRegistry validatorRegistry) {
+    public static OptionDataDefinition build(ParameterDescription parameter,
+                                             boolean autoComplete,
+                                             @NotNull ValidatorRegistry validatorRegistry) {
         final var parameterType = TYPE_MAPPINGS.getOrDefault(parameter.type(), parameter.type());
 
         var optional = parameter.annotation(com.github.kaktushose.jda.commands.annotations.interactions.Optional.class);
@@ -159,7 +159,7 @@ public static ParameterDefinition build(ParameterDescription parameter,
                 commandChoices.add(new Command.Choice(parsed[0], parsed[1]));
             }
         }
-        return new ParameterDefinition(
+        return new OptionDataDefinition(
                 parameterType,
                 optional.isPresent(),
                 autoComplete,
diff --git a/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/SlashCommandDefinition.java b/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/SlashCommandDefinition.java
index 34a911cec..ace1c8c40 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/SlashCommandDefinition.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/SlashCommandDefinition.java
@@ -36,7 +36,7 @@
 /// @param enabledPermissions   a possibly-empty [Set] of [Permission]s this command will be enabled for
 /// @param localizationFunction the [LocalizationFunction] to use for this command
 /// @param description          the command description
-/// @param commandParameters    a [SequencedCollection] of [ParameterDefinition]s
+/// @param commandOptions    a [SequencedCollection] of [OptionDataDefinition]s
 /// @param cooldown             the corresponding [CooldownDefinition]
 /// @param isAutoComplete       whether this command supports auto complete
 public record SlashCommandDefinition(
@@ -50,7 +50,7 @@ public record SlashCommandDefinition(
         @NotNull Set<Permission> enabledPermissions,
         @NotNull LocalizationFunction localizationFunction,
         @NotNull String description,
-        @NotNull SequencedCollection<ParameterDefinition> commandParameters,
+        @NotNull SequencedCollection<OptionDataDefinition> commandOptions,
         @NotNull CooldownDefinition cooldown,
         boolean isAutoComplete
 ) implements CommandDefinition {
@@ -78,10 +78,10 @@ public static Optional<SlashCommandDefinition> build(MethodBuildContext context)
                 .flatMap(Collection::stream)
                 .anyMatch(name::startsWith);
 
-        // build parameter definitions
-        List<ParameterDefinition> parameters = method.parameters().stream()
+        // build option data definitions
+        List<OptionDataDefinition> commandOptions = method.parameters().stream()
                 .filter(it -> !(CommandEvent.class.isAssignableFrom(it.type())))
-                .map(parameter -> ParameterDefinition.build(parameter, autoComplete, context.validatorRegistry()))
+                .map(parameter -> OptionDataDefinition.build(parameter, autoComplete, context.validatorRegistry()))
                 .toList();
 
         Set<Permission> enabledFor = Set.of(command.enabledFor());
@@ -91,7 +91,7 @@ public static Optional<SlashCommandDefinition> build(MethodBuildContext context)
 
         List<Class<?>> signature = new ArrayList<>();
         signature.add(CommandEvent.class);
-        parameters.forEach(it -> signature.add(it.type()));
+        commandOptions.forEach(it -> signature.add(it.type()));
         if (Helpers.checkSignature(method, signature)) {
             return Optional.empty();
         }
@@ -112,7 +112,7 @@ public static Optional<SlashCommandDefinition> build(MethodBuildContext context)
                 enabledFor,
                 context.localizationFunction(),
                 command.desc(),
-                parameters,
+                commandOptions,
                 cooldownDefinition,
                 autoComplete
         ));
@@ -132,7 +132,7 @@ public SlashCommandData toJDAEntity() {
                 .setNSFW(nsfw)
                 .setLocalizationFunction(localizationFunction)
                 .setDefaultPermissions(DefaultMemberPermissions.enabledFor(enabledPermissions));
-        commandParameters.forEach(parameter -> {
+        commandOptions.forEach(parameter -> {
             if (CommandEvent.class.isAssignableFrom(parameter.type())) {
                 return;
             }
@@ -150,7 +150,7 @@ public SubcommandData toSubCommandData(String label) {
                 description.replaceAll("N/A", "no description")
 
         );
-        commandParameters.forEach(parameter -> {
+        commandOptions.forEach(parameter -> {
             command.addOptions(parameter.toJDAEntity());
         });
         return command;
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/command/SlashCommandHandler.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/command/SlashCommandHandler.java
index dd85911e8..5910fc03c 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/command/SlashCommandHandler.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/command/SlashCommandHandler.java
@@ -12,13 +12,11 @@
 import com.github.kaktushose.jda.commands.embeds.error.ErrorMessageFactory;
 import com.github.kaktushose.jda.commands.internal.Helpers;
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
+import net.dv8tion.jda.api.interactions.commands.OptionMapping;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Optional;
+import java.util.*;
 
 @ApiStatus.Internal
 public final class SlashCommandHandler extends EventHandler<SlashCommandInteractionEvent> {
@@ -40,8 +38,10 @@ protected InvocationContext<SlashCommandInteractionEvent> prepare(@NotNull Slash
     }
 
     private Optional<List<Object>> parseArguments(SlashCommandDefinition command, SlashCommandInteractionEvent event, Runtime runtime) {
-        var input = command.commandParameters().stream()
-                .map(it -> event.getOption(it.name()).getAsString())
+        var input = command.commandOptions().stream()
+                .map(it -> event.getOption(it.name()))
+                .filter(Objects::nonNull)
+                .map(OptionMapping::getAsString)
                 .toArray(String[]::new);
 
         List<Object> arguments = new ArrayList<>();
@@ -50,7 +50,7 @@ private Optional<List<Object>> parseArguments(SlashCommandDefinition command, Sl
         ErrorMessageFactory messageFactory = implementationRegistry.getErrorMessageFactory();
 
         log.debug("Type adapting arguments...");
-        var parameters = List.copyOf(command.commandParameters());
+        var parameters = List.copyOf(command.commandOptions());
         for (int i = 0; i < parameters.size(); i++) {
             var parameter = parameters.get(i);
 
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/ConstraintMiddleware.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/ConstraintMiddleware.java
index 1c066c347..50977406f 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/ConstraintMiddleware.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/ConstraintMiddleware.java
@@ -1,9 +1,9 @@
 package com.github.kaktushose.jda.commands.dispatching.middleware.impl;
 
-import com.github.kaktushose.jda.commands.definitions.interactions.command.ParameterDefinition;
 import com.github.kaktushose.jda.commands.definitions.interactions.command.SlashCommandDefinition;
 import com.github.kaktushose.jda.commands.dispatching.ImplementationRegistry;
 import com.github.kaktushose.jda.commands.dispatching.context.InvocationContext;
+import com.github.kaktushose.jda.commands.dispatching.events.Event;
 import com.github.kaktushose.jda.commands.dispatching.middleware.Middleware;
 import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
@@ -12,8 +12,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-/// A [Middleware] implementation that will check the parameter constraints a
-/// [SlashCommandDefinition] might have.
+/// A [Middleware] implementation that will check the parameter constraints a [SlashCommandDefinition] might have.
 ///
 /// @see com.github.kaktushose.jda.commands.dispatching.validation.ValidatorRegistry ValidatorRegistry
 public class ConstraintMiddleware implements Middleware {
@@ -32,27 +31,20 @@ public ConstraintMiddleware(ImplementationRegistry implementationRegistry) {
     /// @param context the [InvocationContext] to filter
     @Override
     public void accept(@NotNull InvocationContext<?> context) {
-        if (!(context.definition() instanceof SlashCommandDefinition command))
-            return;
+        if (!(context.definition() instanceof SlashCommandDefinition command)) return;
 
         var arguments = new ArrayList<>(context.arguments());
-        List<ParameterDefinition> parameters = List.copyOf(command.commandParameters());
+        arguments.removeIf(Event.class::isInstance);
+        var commandOptions = List.copyOf(command.commandOptions());
 
         log.debug("Applying parameter constraints...");
-        for (int i = 1; i < arguments.size(); i++) {
-            Object argument = arguments.get(i);
-            ParameterDefinition parameter = parameters.get(i);
-            for (ParameterDefinition.ConstraintDefinition constraint : parameter.constraints()) {
-                log.debug("Found constraint {} for parameter {}", constraint, parameter.type().getName());
-
-                boolean validated = constraint.validator().apply(argument, constraint.annotation(), context);
-
-                if (!validated) {
-                    context.cancel(
-                            implementationRegistry
-                                    .getErrorMessageFactory()
-                                    .getConstraintFailedMessage(context, constraint)
-                    );
+        for (int i = 0; i < arguments.size(); i++) {
+            var argument = arguments.get(i);
+            var optionData = commandOptions.get(i);
+            for (var constraint : optionData.constraints()) {
+                log.debug("Found constraint {} for parameter {}", constraint, optionData.type().getName());
+                if (!constraint.validator().apply(argument, constraint.annotation(), context)) {
+                    context.cancel(implementationRegistry.getErrorMessageFactory().getConstraintFailedMessage(context, constraint));
                     log.debug("Constraint failed!");
                     return;
                 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/embeds/error/DefaultErrorMessageFactory.java b/src/main/java/com/github/kaktushose/jda/commands/embeds/error/DefaultErrorMessageFactory.java
index 75e33bac6..0bc332e30 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/embeds/error/DefaultErrorMessageFactory.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/embeds/error/DefaultErrorMessageFactory.java
@@ -1,6 +1,6 @@
 package com.github.kaktushose.jda.commands.embeds.error;
 
-import com.github.kaktushose.jda.commands.definitions.interactions.command.ParameterDefinition;
+import com.github.kaktushose.jda.commands.definitions.interactions.command.OptionDataDefinition.ConstraintDefinition;
 import com.github.kaktushose.jda.commands.definitions.interactions.command.SlashCommandDefinition;
 import com.github.kaktushose.jda.commands.dispatching.events.interactions.CommandEvent;
 import net.dv8tion.jda.api.EmbedBuilder;
@@ -26,7 +26,7 @@ public MessageCreateData getTypeAdaptingFailedMessage(@NotNull ErrorContext cont
         StringBuilder sbExpected = new StringBuilder();
         SlashCommandDefinition command = (SlashCommandDefinition) context.definition();
 
-        command.commandParameters().forEach(parameter -> {
+        command.commandOptions().forEach(parameter -> {
             if (CommandEvent.class.isAssignableFrom(parameter.type())) {
                 return;
             }
@@ -72,7 +72,7 @@ public MessageCreateData getInsufficientPermissionsMessage(@NotNull ErrorContext
 
     @NotNull
     @Override
-    public MessageCreateData getConstraintFailedMessage(@NotNull ErrorContext context, @NotNull ParameterDefinition.ConstraintDefinition constraint) {
+    public MessageCreateData getConstraintFailedMessage(@NotNull ErrorContext context, @NotNull ConstraintDefinition constraint) {
         return new MessageCreateBuilder().setEmbeds(new EmbedBuilder()
                 .setColor(Color.ORANGE)
                 .setTitle("Parameter Error")
diff --git a/src/main/java/com/github/kaktushose/jda/commands/embeds/error/ErrorMessageFactory.java b/src/main/java/com/github/kaktushose/jda/commands/embeds/error/ErrorMessageFactory.java
index 4141de9d2..3b97efe22 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/embeds/error/ErrorMessageFactory.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/embeds/error/ErrorMessageFactory.java
@@ -2,7 +2,7 @@
 
 import com.github.kaktushose.jda.commands.annotations.Implementation;
 import com.github.kaktushose.jda.commands.definitions.interactions.InteractionDefinition;
-import com.github.kaktushose.jda.commands.definitions.interactions.command.ParameterDefinition.ConstraintDefinition;
+import com.github.kaktushose.jda.commands.definitions.interactions.command.OptionDataDefinition.ConstraintDefinition;
 import net.dv8tion.jda.api.entities.Message;
 import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent;
 import net.dv8tion.jda.api.utils.messages.MessageCreateData;
diff --git a/src/main/java/com/github/kaktushose/jda/commands/embeds/error/JsonErrorMessageFactory.java b/src/main/java/com/github/kaktushose/jda/commands/embeds/error/JsonErrorMessageFactory.java
index a3f1daed1..b942c8346 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/embeds/error/JsonErrorMessageFactory.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/embeds/error/JsonErrorMessageFactory.java
@@ -1,6 +1,6 @@
 package com.github.kaktushose.jda.commands.embeds.error;
 
-import com.github.kaktushose.jda.commands.definitions.interactions.command.ParameterDefinition;
+import com.github.kaktushose.jda.commands.definitions.interactions.command.OptionDataDefinition.ConstraintDefinition;
 import com.github.kaktushose.jda.commands.definitions.interactions.command.SlashCommandDefinition;
 import com.github.kaktushose.jda.commands.dispatching.events.interactions.CommandEvent;
 import com.github.kaktushose.jda.commands.embeds.EmbedCache;
@@ -34,7 +34,7 @@ public MessageCreateData getTypeAdaptingFailedMessage(@NotNull ErrorContext cont
         StringBuilder sbExpected = new StringBuilder();
         SlashCommandDefinition command = (SlashCommandDefinition) context.definition();
 
-        command.commandParameters().forEach(parameter -> {
+        command.commandOptions().forEach(parameter -> {
             if (CommandEvent.class.isAssignableFrom(parameter.type())) {
                 return;
             }
@@ -76,7 +76,7 @@ public MessageCreateData getInsufficientPermissionsMessage(@NotNull ErrorContext
 
     @NotNull
     @Override
-    public MessageCreateData getConstraintFailedMessage(@NotNull ErrorContext context, @NotNull ParameterDefinition.ConstraintDefinition constraint) {
+    public MessageCreateData getConstraintFailedMessage(@NotNull ErrorContext context, @NotNull ConstraintDefinition constraint) {
         if (!embedCache.containsEmbed("constraintFailed")) {
             return super.getConstraintFailedMessage(context, constraint);
         }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/internal/Helpers.java b/src/main/java/com/github/kaktushose/jda/commands/internal/Helpers.java
index 531a7516a..994953244 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/internal/Helpers.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/internal/Helpers.java
@@ -19,7 +19,7 @@
 import java.lang.reflect.Method;
 import java.util.*;
 
-import static com.github.kaktushose.jda.commands.definitions.interactions.command.ParameterDefinition.TYPE_MAPPINGS;
+import static com.github.kaktushose.jda.commands.definitions.interactions.command.OptionDataDefinition.TYPE_MAPPINGS;
 
 /// Collection of helper methods that are used inside the framework.
 @ApiStatus.Internal
diff --git a/src/test/java/commands/SlashCommandDefinitionTest.java b/src/test/java/commands/SlashCommandDefinitionTest.java
index 5f3732c73..62325a20f 100644
--- a/src/test/java/commands/SlashCommandDefinitionTest.java
+++ b/src/test/java/commands/SlashCommandDefinitionTest.java
@@ -117,7 +117,7 @@ public void method_withCommandEvent_ShouldWork() throws NoSuchMethodException {
         assertNotNull(definition);
 
 
-        assertTrue(definition.commandParameters().isEmpty());
+        assertTrue(definition.commandOptions().isEmpty());
     }
 
     @Test
@@ -129,8 +129,8 @@ public void method_withUnsupportedType_ShouldWork() throws NoSuchMethodException
         assertNotNull(definition);
 
 
-        assertEquals(1, definition.commandParameters().size());
-        assertEquals(UnsupportedType.class, definition.commandParameters().getFirst().type());
+        assertEquals(1, definition.commandOptions().size());
+        assertEquals(UnsupportedType.class, definition.commandOptions().getFirst().type());
     }
 
     @Test
@@ -142,8 +142,8 @@ public void method_withArgumentsAfterOptional_ShouldWork() throws NoSuchMethodEx
         assertNotNull(definition);
 
 
-        assertEquals(2, definition.commandParameters().size());
-        var parameters = List.copyOf(definition.commandParameters());
+        assertEquals(2, definition.commandOptions().size());
+        var parameters = List.copyOf(definition.commandOptions());
         assertTrue(parameters.get(0).optional());
         assertFalse(parameters.get(1).optional());
     }
@@ -156,8 +156,8 @@ public void method_withOptionalAfterOptional_ShouldWork() throws NoSuchMethodExc
         assertNotNull(definition);
 
 
-        assertEquals(2, definition.commandParameters().size());
-        var parameters = List.copyOf(definition.commandParameters());
+        assertEquals(2, definition.commandOptions().size());
+        var parameters = List.copyOf(definition.commandOptions());
         assertEquals(String.class, parameters.get(0).type());
         assertEquals(Integer.class, parameters.get(1).type());
     }

From cf14e46f5cdc8bd22b1982e74fd36969f3db7436 Mon Sep 17 00:00:00 2001
From: Kaktushose <42280757+Kaktushose@users.noreply.github.com>
Date: Sun, 5 Jan 2025 19:48:51 +0100
Subject: [PATCH 18/38] fix optional argument handling in type adapting

---
 .../command/OptionDataDefinition.java         | 20 +-----
 .../handling/command/SlashCommandHandler.java | 71 ++++++++-----------
 .../jda/commands/internal/Helpers.java        |  4 +-
 ...est.java => OptionDataDefinitionTest.java} | 12 ++--
 4 files changed, 38 insertions(+), 69 deletions(-)
 rename src/test/java/parameters/{ParameterDefinitionTest.java => OptionDataDefinitionTest.java} (81%)

diff --git a/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/OptionDataDefinition.java b/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/OptionDataDefinition.java
index 3e7402c79..59116a286 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/OptionDataDefinition.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/OptionDataDefinition.java
@@ -21,7 +21,6 @@
 import net.dv8tion.jda.api.interactions.commands.Command;
 import net.dv8tion.jda.api.interactions.commands.OptionType;
 import net.dv8tion.jda.api.interactions.commands.build.OptionData;
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -53,19 +52,6 @@ public record OptionDataDefinition(
         @NotNull Collection<ConstraintDefinition> constraints
 ) implements Definition, JDAEntity<OptionData> {
 
-    /// A mapping of primitive types and their wrapper classes.
-    @ApiStatus.Internal
-    public static final Map<Class<?>, Class<?>> TYPE_MAPPINGS = Map.ofEntries(
-            entry(byte.class, Byte.class),
-            entry(short.class, Short.class),
-            entry(int.class, Integer.class),
-            entry(long.class, Long.class),
-            entry(double.class, Double.class),
-            entry(float.class, Float.class),
-            entry(boolean.class, Boolean.class),
-            entry(char.class, Character.class)
-    );
-
     private static final Map<Class<?>, OptionType> OPTION_TYPE_MAPPINGS = Map.ofEntries(
             entry(Byte.class, OptionType.STRING),
             entry(Short.class, OptionType.STRING),
@@ -113,8 +99,6 @@ public record OptionDataDefinition(
     public static OptionDataDefinition build(ParameterDescription parameter,
                                              boolean autoComplete,
                                              @NotNull ValidatorRegistry validatorRegistry) {
-        final var parameterType = TYPE_MAPPINGS.getOrDefault(parameter.type(), parameter.type());
-
         var optional = parameter.annotation(com.github.kaktushose.jda.commands.annotations.interactions.Optional.class);
         var defaultValue = "";
         if (optional.isPresent()) {
@@ -129,7 +113,7 @@ public static OptionDataDefinition build(ParameterDescription parameter,
         parameter.annotations().stream()
                 .filter(it -> it.annotationType().isAnnotationPresent(Constraint.class))
                 .forEach(it -> {
-                    var validator = validatorRegistry.get(it.annotationType(), parameterType);
+                    var validator = validatorRegistry.get(it.annotationType(), parameter.type());
                     validator.ifPresent(value -> constraints.add(ConstraintDefinition.build(value, it)));
                 });
 
@@ -160,7 +144,7 @@ public static OptionDataDefinition build(ParameterDescription parameter,
             }
         }
         return new OptionDataDefinition(
-                parameterType,
+                parameter.type(),
                 optional.isPresent(),
                 autoComplete,
                 defaultValue,
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/command/SlashCommandHandler.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/command/SlashCommandHandler.java
index 5910fc03c..53f1b84a7 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/command/SlashCommandHandler.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/command/SlashCommandHandler.java
@@ -2,7 +2,6 @@
 
 import com.github.kaktushose.jda.commands.definitions.interactions.command.SlashCommandDefinition;
 import com.github.kaktushose.jda.commands.dispatching.Runtime;
-import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapter;
 import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapterRegistry;
 import com.github.kaktushose.jda.commands.dispatching.context.InvocationContext;
 import com.github.kaktushose.jda.commands.dispatching.events.interactions.CommandEvent;
@@ -16,7 +15,9 @@
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
 
 @ApiStatus.Internal
 public final class SlashCommandHandler extends EventHandler<SlashCommandInteractionEvent> {
@@ -39,70 +40,56 @@ protected InvocationContext<SlashCommandInteractionEvent> prepare(@NotNull Slash
 
     private Optional<List<Object>> parseArguments(SlashCommandDefinition command, SlashCommandInteractionEvent event, Runtime runtime) {
         var input = command.commandOptions().stream()
-                .map(it -> event.getOption(it.name()))
-                .filter(Objects::nonNull)
-                .map(OptionMapping::getAsString)
-                .toArray(String[]::new);
-
-        List<Object> arguments = new ArrayList<>();
-        arguments.addFirst(new CommandEvent(event, registry, runtime, command));
+                .map(it -> Optional.ofNullable(event.getOption(it.name())).map(OptionMapping::getAsString))
+                .map(it -> it.orElse(null))
+                .toList();
 
+        List<Object> parsedArguments = new ArrayList<>();
         ErrorMessageFactory messageFactory = implementationRegistry.getErrorMessageFactory();
 
         log.debug("Type adapting arguments...");
-        var parameters = List.copyOf(command.commandOptions());
-        for (int i = 0; i < parameters.size(); i++) {
-            var parameter = parameters.get(i);
-
-            // if parameter is array don't parse
-            if (String[].class.isAssignableFrom(parameter.type())) {
-                log.debug("First parameter is String array. Not adapting arguments");
-                arguments.add(input);
-                break;
-            }
+        var commandOptions = List.copyOf(command.commandOptions());
+        parsedArguments.addFirst(new CommandEvent(event, registry, runtime, command));
 
-            String raw;
-            // current parameter index == total amount of input, check if it's optional else cancel context
-            if (i >= input.length) {
-                if (!parameter.optional()) {
-                    throw new IllegalStateException(
-                            "Command input doesn't match parameter length! Please report this error the the devs of jda-commands."
-                    );
-                }
+        if (input.size() != commandOptions.size()) {
+            throw new IllegalStateException(
+                    "Command input doesn't match command options length! Please report this error the the devs of jda-commands."
+            );
+        }
 
-                // if the default value is an empty String (thus not present) add a null value to the argument list
-                // else try to type adapt the default value
-                if (parameter.defaultValue() == null) {
-                    arguments.add(TypeAdapterRegistry.DEFAULT_MAPPINGS.getOrDefault(parameter.type(), null));
+        for (int i = 0; i < commandOptions.size(); i++) {
+            var commandOption = commandOptions.get(i);
+            var raw = input.get(i);
+            if (raw == null) {
+                if (commandOption.defaultValue() == null) {
+                    System.out.println(commandOption.type());
+                    parsedArguments.add(TypeAdapterRegistry.DEFAULT_MAPPINGS.getOrDefault(commandOption.type(), null));
                     continue;
                 } else {
-                    raw = parameter.defaultValue();
+                    raw = commandOption.defaultValue();
                 }
-            } else {
-                raw = input[i];
             }
+            log.debug("Trying to adapt input \"{}\" to type {}", raw, commandOption.type().getName());
 
-            log.debug("Trying to adapt input \"{}\" to type {}", raw, parameter.type().getName());
-
-            TypeAdapter<?> adapter = adapterRegistry.get(parameter.type()).orElseThrow(() ->
+            var adapter = adapterRegistry.get(commandOption.type()).orElseThrow(() ->
                     new IllegalArgumentException(
                             "No type adapter implementation found for %s. Consider implementing one or change the required type"
-                                    .formatted(parameter.type())
+                                    .formatted(commandOption.type())
                     )
             );
 
-            Optional<?> parsed = adapter.apply(raw, event);
+            var parsed = adapter.apply(raw, event);
             if (parsed.isEmpty()) {
                 log.debug("Type adapting failed!");
                 new MessageReply(event, command).reply(
-                        messageFactory.getTypeAdaptingFailedMessage(Helpers.errorContext(event, command), Arrays.asList(input))
+                        messageFactory.getTypeAdaptingFailedMessage(Helpers.errorContext(event, command), input)
                 );
                 return Optional.empty();
             }
 
-            arguments.add(parsed.get());
+            parsedArguments.add(parsed.get());
             log.debug("Added \"{}\" to the argument list", parsed.get());
         }
-        return Optional.of(arguments);
+        return Optional.of(parsedArguments);
     }
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/internal/Helpers.java b/src/main/java/com/github/kaktushose/jda/commands/internal/Helpers.java
index 994953244..3c6f7e4e4 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/internal/Helpers.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/internal/Helpers.java
@@ -19,8 +19,6 @@
 import java.lang.reflect.Method;
 import java.util.*;
 
-import static com.github.kaktushose.jda.commands.definitions.interactions.command.OptionDataDefinition.TYPE_MAPPINGS;
-
 /// Collection of helper methods that are used inside the framework.
 @ApiStatus.Internal
 public final class Helpers {
@@ -120,7 +118,7 @@ public static boolean isIncorrectParameterType(@NotNull MethodDescription method
     public static boolean checkSignature(MethodDescription method, Collection<Class<?>> methodSignature) {
         var parameters = method.parameters().stream()
                 .map(ParameterDescription::type)
-                .map(it -> TYPE_MAPPINGS.getOrDefault(it, it)).toList();
+                .toList();
         if (!parameters.equals(methodSignature)) {
             log.error("An error has occurred! Skipping Interaction {}.{}:",
                     method.declaringClass().getName(),
diff --git a/src/test/java/parameters/ParameterDefinitionTest.java b/src/test/java/parameters/OptionDataDefinitionTest.java
similarity index 81%
rename from src/test/java/parameters/ParameterDefinitionTest.java
rename to src/test/java/parameters/OptionDataDefinitionTest.java
index af5a6393b..355764fea 100644
--- a/src/test/java/parameters/ParameterDefinitionTest.java
+++ b/src/test/java/parameters/OptionDataDefinitionTest.java
@@ -2,7 +2,7 @@
 
 import com.github.kaktushose.jda.commands.annotations.constraints.Min;
 import com.github.kaktushose.jda.commands.definitions.description.ParameterDescription;
-import com.github.kaktushose.jda.commands.definitions.interactions.command.ParameterDefinition;
+import com.github.kaktushose.jda.commands.definitions.interactions.command.OptionDataDefinition;
 import com.github.kaktushose.jda.commands.dispatching.validation.ValidatorRegistry;
 import com.github.kaktushose.jda.commands.dispatching.validation.impl.MinimumValidator;
 import org.junit.jupiter.api.BeforeAll;
@@ -16,7 +16,7 @@
 
 import static org.junit.jupiter.api.Assertions.*;
 
-public class ParameterDefinitionTest {
+public class OptionDataDefinitionTest {
 
     private static Class<?> controller;
     private static ValidatorRegistry validatorRegistry;
@@ -42,7 +42,7 @@ private static <T> Collection<T> toList(T[] array) {
     @Test
     public void optional_withoutDefault_ShouldBeNull() throws NoSuchMethodException {
         Method method = controller.getDeclaredMethod("optional", Object.class);
-        ParameterDefinition parameter = ParameterDefinition.build(parameter(method.getParameters()[0]), false, validatorRegistry);
+        OptionDataDefinition parameter = OptionDataDefinition.build(parameter(method.getParameters()[0]), false, validatorRegistry);
 
         assertTrue(parameter.optional());
         assertNull(parameter.defaultValue());
@@ -51,7 +51,7 @@ public void optional_withoutDefault_ShouldBeNull() throws NoSuchMethodException
     @Test
     public void optional_withDefault_ShouldWork() throws NoSuchMethodException {
         Method method = controller.getDeclaredMethod("optionalWithDefault", Object.class);
-        ParameterDefinition parameter = ParameterDefinition.build(parameter(method.getParameters()[0]), false, validatorRegistry);
+        OptionDataDefinition parameter = OptionDataDefinition.build(parameter(method.getParameters()[0]), false, validatorRegistry);
 
         assertTrue(parameter.optional());
         assertEquals("default", parameter.defaultValue());
@@ -60,7 +60,7 @@ public void optional_withDefault_ShouldWork() throws NoSuchMethodException {
     @Test
     public void constraintMin_withLimit10_ShouldWork() throws NoSuchMethodException {
         Method method = controller.getDeclaredMethod("constraint", int.class);
-        ParameterDefinition parameter = ParameterDefinition.build(parameter(method.getParameters()[0]), false, validatorRegistry);
+        OptionDataDefinition parameter = OptionDataDefinition.build(parameter(method.getParameters()[0]), false, validatorRegistry);
 
         var constraints = List.copyOf(parameter.constraints());
         assertEquals(1, parameter.constraints().size());
@@ -72,7 +72,7 @@ public void constraintMin_withLimit10_ShouldWork() throws NoSuchMethodException
     @Test
     public void constraint_withMessage_ShouldWork() throws NoSuchMethodException {
         Method method = controller.getDeclaredMethod("constraintWithMessage", int.class);
-        ParameterDefinition parameter = ParameterDefinition.build(parameter(method.getParameters()[0]), false, validatorRegistry);
+        OptionDataDefinition parameter = OptionDataDefinition.build(parameter(method.getParameters()[0]), false, validatorRegistry);
         var constraints = List.copyOf(parameter.constraints());
 
         assertEquals("error message", constraints.getFirst().message());

From 4b57ffd4d9e2c5e63b608b32032ecfe67a899498 Mon Sep 17 00:00:00 2001
From: Kaktushose <42280757+Kaktushose@users.noreply.github.com>
Date: Sun, 5 Jan 2025 22:07:00 +0100
Subject: [PATCH 19/38] remove components when interaction execution fails

---
 .../jda/commands/dispatching/handling/EventHandler.java       | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/EventHandler.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/EventHandler.java
index 84576f9ad..bf6c683b5 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/EventHandler.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/EventHandler.java
@@ -12,6 +12,7 @@
 import com.github.kaktushose.jda.commands.dispatching.middleware.MiddlewareRegistry;
 import com.github.kaktushose.jda.commands.dispatching.middleware.Priority;
 import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent;
+import net.dv8tion.jda.api.interactions.callbacks.IReplyCallback;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -105,6 +106,9 @@ private void invoke(@NotNull InvocationContext<T> invocation, @NotNull Runtime r
             log.error("Interaction execution failed!", exception);
             // this unwraps the underlying error in case of an exception inside the command class
             Throwable throwable = exception instanceof InvocationTargetException ? exception.getCause() : exception;
+            if (invocation.event() instanceof IReplyCallback callback) {
+                callback.getHook().editOriginalComponents().queue();
+            }
             invocation.cancel(implementationRegistry.getErrorMessageFactory().getCommandExecutionFailedMessage(invocation, throwable));
         }
     }

From 186e8a6462ea8480c336953240e47147945fb4ef Mon Sep 17 00:00:00 2001
From: Kaktushose <42280757+Kaktushose@users.noreply.github.com>
Date: Sun, 5 Jan 2025 22:07:21 +0100
Subject: [PATCH 20/38] remove varargs from Component

---
 .../commands/dispatching/reply/Component.java | 28 ++++++++-----------
 .../dispatching/reply/ConfigurableReply.java  |  3 +-
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/Component.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/Component.java
index 54ef65cbc..2415d304a 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/Component.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/Component.java
@@ -4,8 +4,6 @@
 import com.github.kaktushose.jda.commands.annotations.interactions.EntitySelectMenu;
 import com.github.kaktushose.jda.commands.annotations.interactions.StringSelectMenu;
 
-import java.util.Arrays;
-
 /// Represents a component, namely [Button], [StringSelectMenu] or [EntitySelectMenu], that should be added to a reply.
 ///
 /// Also holds the following two settings:
@@ -29,16 +27,16 @@ public record Component(boolean enabled, boolean independent, String name) {
 
     /// Adds enabled, runtime-bound [Component]s to the reply.
     ///
-    /// @param components the name of the method that represents the component
-    public static Component[] enabled(String... components) {
-        return of(true, false, components);
+    /// @param component the name of the method that represents the component
+    public static Component enabled(String component) {
+        return of(true, false, component);
     }
 
     /// Adds disabled, runtime-bound [Component]s to the reply.
     ///
-    /// @param components the name of the method that represents the component
-    public static Component[] disabled(String... components) {
-        return of(false, false, components);
+    /// @param component the name of the method that represents the component
+    public static Component disabled(String component) {
+        return of(false, false, component);
     }
 
     /// Adds enabled, runtime-independent [Component]s to the reply.
@@ -46,19 +44,17 @@ public static Component[] disabled(String... components) {
     /// Every component interaction will create a new [`Runtime`]({@docRoot}/index.html#runtime-concept-heading). Furthermore, the component cannot expire and
     /// will always get executed, even after a bot restart.
     ///
-    /// @param components the name of the method that represents the component
-    public static Component[] independent(String... components) {
-        return of(true, true, components);
+    /// @param component the name of the method that represents the component
+    public static Component independent(String component) {
+        return of(true, true, component);
     }
 
     /// Adds [Component]s with the passed configuration to the reply.
     ///
     /// @param enabled     whether the [Component] should be enabled or disabled
     /// @param independent whether the [Component] should be runtime-bound or independent
-    /// @param components  the name of the method that represents the component
-    public static Component[] of(boolean enabled, boolean independent, String... components) {
-        return Arrays.stream(components)
-                .map(it -> new Component(enabled, independent, it))
-                .toArray(Component[]::new);
+    /// @param component  the name of the method that represents the component
+    public static Component of(boolean enabled, boolean independent, String component) {
+        return new Component(enabled, independent, component);
     }
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/ConfigurableReply.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/ConfigurableReply.java
index e1d52f3fe..d6774a556 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/ConfigurableReply.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/ConfigurableReply.java
@@ -13,6 +13,7 @@
 import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 /// Subtype of [MessageReply] that supports adding components to messages and changing the [ReplyConfig].
@@ -135,7 +136,7 @@ public ConfigurableReply keepComponents(boolean keepComponents) {
     /// @return the current instance for fluent interface
     @NotNull
     public ComponentReply components(@NotNull String... components) {
-        return components(Component.of(true, false, components));
+        return components(Arrays.stream(components).map(Component::enabled).toArray(Component[]::new));
     }
 
     /// Adds an [ActionRow] to the reply and adds the passed [Component] to it.

From 353bbcdabbd24bef2537848fb80c3c049492612e Mon Sep 17 00:00:00 2001
From: Kaktushose <42280757+Kaktushose@users.noreply.github.com>
Date: Sun, 5 Jan 2025 22:09:05 +0100
Subject: [PATCH 21/38] update examples

---
 src/examples/BanCommand.java                  | 56 +++++++++++++++++++
 src/examples/CookieClicker.java               | 32 +++++++++++
 src/examples/ReportCommand.java               | 29 ----------
 src/examples/scope/PremiumCommand.java        | 14 +++++
 src/examples/scope/PremiumGuildsProvider.java | 16 ++++++
 5 files changed, 118 insertions(+), 29 deletions(-)
 create mode 100644 src/examples/BanCommand.java
 create mode 100644 src/examples/CookieClicker.java
 delete mode 100644 src/examples/ReportCommand.java
 create mode 100644 src/examples/scope/PremiumCommand.java
 create mode 100644 src/examples/scope/PremiumGuildsProvider.java

diff --git a/src/examples/BanCommand.java b/src/examples/BanCommand.java
new file mode 100644
index 000000000..86bbe72fe
--- /dev/null
+++ b/src/examples/BanCommand.java
@@ -0,0 +1,56 @@
+import com.github.kaktushose.jda.commands.annotations.interactions.*;
+import com.github.kaktushose.jda.commands.dispatching.events.interactions.CommandEvent;
+import com.github.kaktushose.jda.commands.dispatching.events.interactions.ComponentEvent;
+import com.github.kaktushose.jda.commands.dispatching.events.interactions.ModalEvent;
+import net.dv8tion.jda.api.Permission;
+import net.dv8tion.jda.api.entities.Member;
+import net.dv8tion.jda.api.entities.User;
+import net.dv8tion.jda.api.interactions.commands.Command;
+import net.dv8tion.jda.api.interactions.components.buttons.ButtonStyle;
+
+import java.util.concurrent.TimeUnit;
+
+@Interaction
+@ReplyConfig(keepComponents = false)
+public class BanCommand {
+
+    private int delDays;
+    private Member target;
+    private String reason;
+
+    @ContextCommand(value = "Ban this member", type = Command.Type.USER, enabledFor = Permission.BAN_MEMBERS, isGuildOnly = true)
+    public void onContextBanMember(CommandEvent event, User target) {
+        this.delDays = 0;
+        // we can use safely use complete here because this event has its own virtual thread
+        this.target = event.getGuild().retrieveMemberById(target.getId()).complete();
+        event.replyModal("onReason");
+    }
+
+    @SlashCommand(value = "ban", desc = "Bans a Member", enabledFor = Permission.BAN_MEMBERS, isGuildOnly = true)
+    public void onSlashBanMember(CommandEvent event,
+                            @Param("The member to ban") Member target,
+                            @Param("The history of messages that will be deleted") @Optional("0") int delDays) {
+        this.delDays = delDays;
+        this.target = target;
+        event.replyModal("onReason");
+    }
+
+    @Modal("Ban Reason")
+    public void onReason(ModalEvent event, @TextInput("Please provide a reason") String reason) {
+        this.reason = reason;
+        event.with().components("onConfirm", "onCancel").reply("Are you sure that you want to ban %s for reason %s?", target.getAsMention(), reason);
+    }
+
+    @Button(value = "Yes", style = ButtonStyle.SUCCESS)
+    public void onConfirm(ComponentEvent event) {
+        target.ban(delDays, TimeUnit.DAYS).reason(reason).queue();
+        event.reply("Banned %s", target.getAsMention());
+    }
+
+    @Button(value = "No", style = ButtonStyle.DANGER)
+    public void onCancel(ComponentEvent event) {
+        event.reply("Banning member %s cancelled", target.getAsMention());
+    }
+
+}
+
diff --git a/src/examples/CookieClicker.java b/src/examples/CookieClicker.java
new file mode 100644
index 000000000..031208762
--- /dev/null
+++ b/src/examples/CookieClicker.java
@@ -0,0 +1,32 @@
+import com.github.kaktushose.jda.commands.annotations.interactions.Button;
+import com.github.kaktushose.jda.commands.annotations.interactions.Interaction;
+import com.github.kaktushose.jda.commands.annotations.interactions.SlashCommand;
+import com.github.kaktushose.jda.commands.dispatching.events.interactions.CommandEvent;
+import com.github.kaktushose.jda.commands.dispatching.events.interactions.ComponentEvent;
+import com.github.kaktushose.jda.commands.dispatching.reply.Component;
+import net.dv8tion.jda.api.interactions.components.buttons.ButtonStyle;
+
+@Interaction
+public class CookieClicker {
+
+    private int count;
+
+    @SlashCommand(value = "cookie clicker", desc = "Play cookie clicker")
+    public void onClicker(CommandEvent event) {
+        event.with().components("onCookie", "onReset").reply("You've got %s cookie(s)!", count);
+    }
+
+    @Button(value = "Collect", emoji = "🍪", style = ButtonStyle.SUCCESS)
+    public void onCookie(ComponentEvent event) {
+        count++;
+        event.reply("You've got %s cookie(s)!", count);
+    }
+
+    @Button(value = "Reset", emoji = "🔄", style = ButtonStyle.DANGER)
+    public void onReset(ComponentEvent event) {
+        count = 0;
+        event.reply("You've got %s cookie(s)!", count);
+    }
+
+}
+
diff --git a/src/examples/ReportCommand.java b/src/examples/ReportCommand.java
deleted file mode 100644
index b6ff7bd41..000000000
--- a/src/examples/ReportCommand.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package testing;
-
-import com.github.kaktushose.jda.commands.annotations.*;
-import com.github.kaktushose.jda.commands.entities.CommandEvent;
-import net.dv8tion.jda.api.entities.Member;
-
-@CommandController("report")
-@Permission("user.report")
-public class ReportCommand {
-
-    @Command(name = "Create Report", usage = "{prefix}report @Member (reason)", desc = "Create a new report", category = "Moderation")
-    public void onReportCreate(CommandEvent event, Member member, @Optional("no reason") @Concat String reason) {
-        event.reply("%s got reported for reason %s", member.getAsMention(), reason);
-    }
-
-    @Command(value = "list",
-            name = "Get Report", usage = "{prefix}report list @Member", desc = "Get the reports for a user", category = "Moderation")
-    public void onReportGet(CommandEvent event, Member member) {
-        event.reply("This member has no reports yet");
-    }
-
-    @Command(value = {"remove", "rm"},
-            name = "Remove Report", usage = "{prefix}report remove @Member", desc = "Remove the reports of a user", category = "Moderation")
-    public void onReportRemove(CommandEvent event, Member member) {
-        event.reply("Cleared reports for member %s", member.getAsMention());
-        event.kv().put("error", error);
-    }
-
-}
diff --git a/src/examples/scope/PremiumCommand.java b/src/examples/scope/PremiumCommand.java
new file mode 100644
index 000000000..c2193ef8b
--- /dev/null
+++ b/src/examples/scope/PremiumCommand.java
@@ -0,0 +1,14 @@
+import com.github.kaktushose.jda.commands.annotations.interactions.CommandScope;
+import com.github.kaktushose.jda.commands.annotations.interactions.Interaction;
+import com.github.kaktushose.jda.commands.annotations.interactions.SlashCommand;
+import com.github.kaktushose.jda.commands.dispatching.events.interactions.CommandEvent;
+
+@Interaction
+public class PremiumCommand {
+
+    @SlashCommand(value = "paid feature", scope = CommandScope.GUILD)
+    public void onCommand(CommandEvent event) {
+        event.reply("Hello World!");
+    }
+
+}
\ No newline at end of file
diff --git a/src/examples/scope/PremiumGuildsProvider.java b/src/examples/scope/PremiumGuildsProvider.java
new file mode 100644
index 000000000..2fe765a5c
--- /dev/null
+++ b/src/examples/scope/PremiumGuildsProvider.java
@@ -0,0 +1,16 @@
+import com.github.kaktushose.jda.commands.scope.GuildScopeProvider;
+import net.dv8tion.jda.api.interactions.commands.build.CommandData;
+
+import java.util.Set;
+
+public class PremiumGuildsProvider implements GuildScopeProvider {
+
+    @Override
+    public Set<Long> apply(CommandData commandData) {
+        if (commandData.getName().equals("paid feature")) {
+            // this is the place where you could also perform a database lookup
+            return Set.of(1234567890L);
+        }
+        return Set.of();
+    }
+}
\ No newline at end of file

From 36e476ba366cfceeddb8ce4f855dcc6c49ce240e Mon Sep 17 00:00:00 2001
From: Kaktushose <42280757+Kaktushose@users.noreply.github.com>
Date: Sun, 5 Jan 2025 22:21:24 +0100
Subject: [PATCH 22/38] bump JDA version and update readme

---
 README.md | 176 +++++++++---------------------------------------------
 pom.xml   |   2 +-
 2 files changed, 28 insertions(+), 150 deletions(-)

diff --git a/README.md b/README.md
index fd086e0e7..5b70b9ee9 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-[![JDA-Version](https://img.shields.io/badge/JDA%20Version-5.0.0--beta.22-important)](https://github.com/DV8FromTheWorld/JDA#download)
+[![JDA-Version](https://img.shields.io/badge/JDA%20Version-5.2.2-important)](https://github.com/DV8FromTheWorld/JDA#download)
 [![Generic badge](https://img.shields.io/badge/Download-4.0.0--beta.2-green.svg)](https://github.com/Kaktushose/jda-commands/releases/latest)
 [![Java CI](https://github.com/Kaktushose/jda-commands/actions/workflows/ci.yml/badge.svg?branch=dev)](https://github.com/Kaktushose/jda-commands/actions/workflows/ci.yml)
 [![Codacy Badge](https://app.codacy.com/project/badge/Grade/f2b4367f6d0f42d89b7e51331f3ce299)](https://app.codacy.com/gh/Kaktushose/jda-commands/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_grade)
@@ -11,25 +11,29 @@ A lightweight, easy-to-use command framework for building Discord bots
 with [JDA](https://github.com/DV8FromTheWorld/JDA) with full support for interactions. JDA-Commands goal is to remove
 any boilerplate code, so you can focus solely on the business logic of your bot - writing bots has never been easier!
 
-### Version Overview
+### Version Guide
 
-| jda-commands                                                               | JDA | Text Commands | Interactions | Stable |
-|----------------------------------------------------------------------------|-----|---------------|--------------|--------|
-| [4.0.0-beta.2](https://github.com/Kaktushose/jda-commands/releases/latest) | 5   | ❌             | ✅            | ✅      |
-| [3.0.0](https://github.com/Kaktushose/jda-commands/releases/tag/v3.0.0)    | 5   | ✅             | ❌            | ✅      |
-| [2.2.0](https://github.com/Kaktushose/jda-commands/releases/tag/v.2.0.0)   | 4   | ✅             | ❌            | ✅      |
+| jda-commands                                                               | JDA | Text Commands | Interactions |
+|----------------------------------------------------------------------------|-----|---------------|--------------|
+| [4.0.0-beta.2](https://github.com/Kaktushose/jda-commands/releases/latest) | 5   | ❌             | ✅            |
+| [3.0.0](https://github.com/Kaktushose/jda-commands/releases/tag/v3.0.0)    | 5   | ✅             | ❌            |
+| [2.2.0](https://github.com/Kaktushose/jda-commands/releases/tag/v.2.0.0)   | 4   | ✅             | ❌            |
 
 ## Features
 
 - Simple and intuitive syntax following an annotation-driven and declarative style
 
+
 - Built-in support for slash commands, components, context menus and modals
 
-- Type adapting of parameters
 
-- Expandable execution chain including type adapters, filters, permissions and constraints
+- Automatic and customizable type adapting and constraint validation of parameters
+
+
+- Expandable executing chain (Middleware API)
+
 
-- Built-in support for ephemeral replies, permissions, localization
+- Multithreaded event handling using VirtualThreads
 
 ---
 
@@ -42,31 +46,20 @@ public class CookieClicker {
     private int count;
 
     @SlashCommand(value = "cookie clicker", desc = "Play cookie clicker")
-    public void onCommand(CommandEvent event) {
-        event.withButtons("onClick").reply("You have %d cookies(s)!", count);
+    public void onClicker(CommandEvent event) {
+        event.with().components("onCookie", "onReset").reply("You've got %s cookie(s)!", count);
     }
 
-    @Button(value = "Click me!", emoji = "🍪")
-    public void onClick(ComponentEvent event) {
+    @Button(value = "Collect", emoji = "🍪", style = ButtonStyle.SUCCESS)
+    public void onCookie(ComponentEvent event) {
         count++;
-        event.reply("You have %d cookies(s)!", count);
+        event.reply("You've got %s cookie(s)!", count);
     }
-}
-```
-
-Additionally, let's rebuild the official slash commands example from the [JDA Readme](https://github.com/DV8FromTheWorld/JDA#listening-to-events) as a more complex example:
 
-```java
-@Interaction
-public class BanCommand {
-
-    @Permissions("BAN_MEMBERS")
-    @SlashCommand(value = "ban", enabledFor = Permission.BAN_MEMBERS, desc = "Bans a user", ephemeral = true)
-    public void onBan(CommandEvent event, @Param("The member to ban") Member target, @Optional("no reason") @Param("The ban reason") String reason) {
-        event.getGuild().ban(target, 0, TimeUnit.SECONDS).reason(reason).queue(
-                success -> event.reply("**%s** was banned by **%s**", target.getAsMention(), event.getUser().getAsMention()),
-                error -> event.reply("Some error occurred, try again!")
-        );
+    @Button(value = "Reset", emoji = "🔄", style = ButtonStyle.DANGER)
+    public void onReset(ComponentEvent event) {
+        count = 0;
+        event.reply("You've got %s cookie(s)!", count);
     }
 }
 ```
@@ -74,127 +67,11 @@ public class BanCommand {
 Finally, start the framework by calling:
 
 ```java
-JDACommands.start(jda, Main.class, "com.package");
+JDACommands.start(jda, Main.class);
 ```
 
 ---
 
-You can find a detailed list of all features down below _(click on the ▶ for details)_:
-
-### Execution
-
-<details>
-<summary>Request-scoped Instances</summary>
-
-For every command execution a new instance of the controller class is created. Subsequent executions of components are
-executed in the same instance.
-This allows you to store stateful objects, like the target of a ban command, _inside_ the controller class.
-
-</details>
-
-<details>
-<summary>Private Channel Support</summary>
-
-If enabled, commands can also be executed in direct messages.
-
-</details>
-
-### Parameters
-
-<details>
-<summary>Type Adapting</summary>
-
-As seen in the example, the method signature will be translated into a command syntax. When a command gets called, this
-framework will adapt the raw String input to the types specified in the method signature. As a result all the
-boilerplate code for parsing parameters becomes obsolete.
-
-</details>
-
-<details>
-<summary>Parameter Validation</summary>
-
-Parameters can have additional constraints, such as min or max value, etc. When a constraint fails, an error message
-will be sent automatically. You can also define your own constraints.
-
-![embed](https://cdn.discordapp.com/attachments/545967082253189121/938871716749377586/Untitled.png)
-
-</details>
-
-### Constraints
-
-<details>
-<summary>Permissions System</summary>
-
-Besides the default permissions system of slash commands, this framework comes in with an own system, supporting both
-discord and custom permissions. By default, you can use all
-permissions defined inside
-JDAs [Permission Embed](https://ci.dv8tion.net/job/JDA/javadoc/net/dv8tion/jda/api/Permission.html). By adding your own
-permission validator, you can use custom permission strings and bind permissions to certain roles or members.
-
-</details>
-
-<details>
-<summary>Filter Chain</summary>
-
-You can define filters that will run before each command execution. This can be useful to perform additional checks,
-which aren't supported by this framework by default.
-
-</details>
-
-<details>
-<summary>Cooldown System</summary>
-
-Commands can have a per-user cooldown to rate limit the execution of commands.
-
-</details>
-
-### Misc
-
-<details>
-<summary>Error Messages</summary>
-
-There are default error embeds for all validation systems of this framework, i.e. parameter constraints, permissions,
-etc.
-
-</details>
-
-<details>
-<summary>Localization</summary>
-
-This framework supports the use of
-JDAs [LocalizationFunction](https://ci.dv8tion.net/job/JDA5/javadoc/net/dv8tion/jda/api/interactions/commands/localization/LocalizationFunction.html)
-for localizing slash commands.
-
-Furthermore, you can adapt the auto generated bot responses. All embeds
-sent can also be loaded from a json file, which uses
-placeholders. _[example](https://github.com/Kaktushose/jda-commands/blob/master/src/examples/embeds.json)_
-
-</details>
-
-<details>
-<summary>Embed Deserialization</summary>
-
-You can serialize and deserialize JDAs EmbedBuilder object to json. This comes in pretty handy, because for example you
-don't have to recompile the whole project if you find one typo inside your
-embed. _[example](https://github.com/Kaktushose/jda-commands/blob/master/src/examples/embeds.json)_
-
-</details>
-
-<details>
-<summary>Dependency Injection</summary>
-
-This framework has a basic implementation of dependency injection, since you don't construct your command classes on
-your own.
-
-</details>
-
-<details>
-<summary>Reflect API</summary>
-
-Just like Javas Reflect API this framework also supports accessing and modifying command definitions at runtime.
-
-</details>
-
 If you want to learn more, check out the [Wiki](https://github.com/Kaktushose/jda-commands/wiki) or
 the [Javadoc](https://kaktushose.github.io/jda-commands/).
 
@@ -241,8 +118,9 @@ dependencies {
 ## Contributing
 
 If you think that something is missing, and you want to add it yourself, feel free to open a pull request. Please try to
-keep your code quality as good as mine and stick to the core concepts of this framework.
+keep your code quality as good as mine and stick to the core concepts of this framework. Also consider opening an issue
+first, so we can discuss if your changes fit to the framework.
 
-Special thanks to all contributors <3
+Special thanks to all contributors, especially to @Goldmensch and @lus <3
 
 [![Contributors Display](https://badges.pufler.dev/contributors/Kaktushose/jda-commands?size=50&padding=5&perRow=10&bots=false)]([https://badges.pufler.dev](https://github.com/Kaktushose/jda-commands/graphs/contributors))
diff --git a/pom.xml b/pom.xml
index d8298bc0d..4f5ed9871 100644
--- a/pom.xml
+++ b/pom.xml
@@ -88,7 +88,7 @@
         <dependency>
             <groupId>net.dv8tion</groupId>
             <artifactId>JDA</artifactId>
-            <version>5.0.2</version>
+            <version>5.2.2</version>
             <exclusions>
                 <exclusion>
                     <groupId>club.minnced</groupId>

From 737f90b69706002a05b4d7bc3ef6fb30967f8667 Mon Sep 17 00:00:00 2001
From: Nick Hensel <47005420+Goldmensch@users.noreply.github.com>
Date: Sun, 5 Jan 2025 23:49:35 +0100
Subject: [PATCH 23/38] Introduce builder and refactor registry handling (#150)

* Add builder and move some registries to internal

* Add docs and remove unnecessary methods

* a

* Fix merge conflict

* Things

* Clean up Registries

* Rename registries

* Add docs

* Fix tests

* Fix list

* Add global reply config

* fix unit tests

* stuff

* Add additionally docs, expose ClassFinder default implementations via static methods and make Descriptions fully immutable

* Fix merge conflicts

* Make org.jetbrains.annotations transitive

* Add @NotNull

* Fix constraint parameter types

* Resolve review

* fix unit tests

---------

Co-authored-by: Kaktushose <42280757+Kaktushose@users.noreply.github.com>
---
 .gitignore                                    |   1 +
 .../kaktushose/jda/commands/JDACommands.java  | 207 +++++--------
 .../jda/commands/JDACommandsBuilder.java      | 200 +++++++++++++
 .../commands/annotations/Implementation.java  |   3 +-
 .../annotations/constraints/Constraint.java   |   2 +-
 .../annotations/constraints/NotRole.java      |   4 +-
 .../annotations/constraints/NotUser.java      |   5 +-
 .../annotations/constraints/Role.java         |   4 +-
 .../annotations/constraints/User.java         |   6 +-
 .../annotations/interactions/Optional.java    |   4 +-
 .../annotations/interactions/ReplyConfig.java |   7 +-
 .../interactions/SlashCommand.java            |   4 +-
 .../description/ClassDescription.java         |  12 +-
 .../definitions/description/ClassFinder.java  |  31 ++
 .../description/MethodDescription.java        |   9 +
 .../description/ParameterDescription.java     |   9 +-
 .../reflective/ReflectiveClassFinder.java     |  15 +-
 .../interactions/InteractionDefinition.java   |  22 +-
 .../interactions/InteractionRegistry.java     |  23 +-
 .../interactions/MethodBuildContext.java      |   6 +-
 .../command/OptionDataDefinition.java         |  24 +-
 .../command/SlashCommandDefinition.java       |   2 +-
 .../dispatching/ImplementationRegistry.java   | 276 ------------------
 .../dispatching/JDAEventListener.java         |   2 +-
 .../jda/commands/dispatching/Runtime.java     |   7 +-
 .../adapter/TypeAdapterRegistry.java          | 111 -------
 .../adapter/internal/TypeAdapters.java        |  95 ++++++
 .../dispatching/context/package-info.java     |   2 -
 .../events/ModalReplyableEvent.java           |   6 +-
 .../dispatching/events/ReplyableEvent.java    |   7 +-
 .../events/interactions/CommandEvent.java     |   5 +-
 .../events/interactions/ComponentEvent.java   |   5 +-
 .../events/interactions/ModalEvent.java       |   5 +-
 .../handling/ComponentHandler.java            |   2 +-
 .../handling/DispatchingContext.java          |  18 +-
 .../dispatching/handling/EventHandler.java    |  20 +-
 .../dispatching/handling/ModalHandler.java    |   2 +-
 .../command/ContextCommandHandler.java        |   2 +-
 .../handling/command/SlashCommandHandler.java |  13 +-
 .../dispatching/middleware/Middleware.java    |   5 +-
 .../middleware/MiddlewareRegistry.java        |  89 ------
 .../middleware/impl/ConstraintMiddleware.java |  12 +-
 .../middleware/impl/CooldownMiddleware.java   |  10 +-
 .../impl/PermissionsMiddleware.java           |  14 +-
 .../middleware/internal/Middlewares.java      |  58 ++++
 .../dispatching/reply/GlobalReplyConfig.java  |  31 --
 .../dispatching/reply/MessageReply.java       |   8 -
 .../validation/ValidatorRegistry.java         |  89 ------
 .../validation/internal/Validators.java       |  66 +++++
 .../jda/commands/internal/Helpers.java        |  21 --
 src/main/java/module-info.java                |   4 +-
 .../adapting/TypeAdapterRegistryTest.java     |  32 +-
 src/test/java/adapting/mock/GuildMock.java    |   5 +
 .../java/adapting/mock/JDACommandsMock.java   |  12 +-
 src/test/java/adapting/mock/JDAMock.java      |  16 +
 .../commands/SlashCommandDefinitionTest.java  |  13 +-
 .../parameters/OptionDataDefinitionTest.java  |  19 +-
 .../parameters/ParameterTestController.java   |   4 +
 src/test/java/reply/ReplyConfigTest.java      |  53 +++-
 59 files changed, 816 insertions(+), 923 deletions(-)
 create mode 100644 src/main/java/com/github/kaktushose/jda/commands/JDACommandsBuilder.java
 create mode 100644 src/main/java/com/github/kaktushose/jda/commands/definitions/description/ClassFinder.java
 delete mode 100644 src/main/java/com/github/kaktushose/jda/commands/dispatching/ImplementationRegistry.java
 delete mode 100644 src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/TypeAdapterRegistry.java
 create mode 100644 src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/internal/TypeAdapters.java
 delete mode 100644 src/main/java/com/github/kaktushose/jda/commands/dispatching/context/package-info.java
 delete mode 100644 src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/MiddlewareRegistry.java
 create mode 100644 src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/internal/Middlewares.java
 delete mode 100644 src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/GlobalReplyConfig.java
 delete mode 100644 src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/ValidatorRegistry.java
 create mode 100644 src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/internal/Validators.java

diff --git a/.gitignore b/.gitignore
index 43fe3c3df..d7bd29be3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ target/
 src/main/java/testing
 src/main/resources
 /logs
+.direnv
diff --git a/src/main/java/com/github/kaktushose/jda/commands/JDACommands.java b/src/main/java/com/github/kaktushose/jda/commands/JDACommands.java
index cbeb02375..331f13326 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/JDACommands.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/JDACommands.java
@@ -3,30 +3,23 @@
 import com.github.kaktushose.jda.commands.annotations.interactions.CommandScope;
 import com.github.kaktushose.jda.commands.annotations.interactions.EntitySelectMenu;
 import com.github.kaktushose.jda.commands.annotations.interactions.StringSelectMenu;
-import com.github.kaktushose.jda.commands.definitions.description.reflective.ReflectiveClassFinder;
-import com.github.kaktushose.jda.commands.definitions.description.reflective.ReflectiveDescriptor;
+import com.github.kaktushose.jda.commands.definitions.description.ClassFinder;
 import com.github.kaktushose.jda.commands.definitions.interactions.CustomId;
+import com.github.kaktushose.jda.commands.definitions.interactions.InteractionDefinition;
 import com.github.kaktushose.jda.commands.definitions.interactions.InteractionRegistry;
 import com.github.kaktushose.jda.commands.definitions.interactions.component.ButtonDefinition;
 import com.github.kaktushose.jda.commands.definitions.interactions.component.menu.SelectMenuDefinition;
-import com.github.kaktushose.jda.commands.dependency.DefaultDependencyInjector;
 import com.github.kaktushose.jda.commands.dependency.DependencyInjector;
-import com.github.kaktushose.jda.commands.dispatching.ImplementationRegistry;
 import com.github.kaktushose.jda.commands.dispatching.JDAEventListener;
-import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapterRegistry;
+import com.github.kaktushose.jda.commands.dispatching.adapter.internal.TypeAdapters;
 import com.github.kaktushose.jda.commands.dispatching.expiration.ExpirationStrategy;
 import com.github.kaktushose.jda.commands.dispatching.handling.DispatchingContext;
-import com.github.kaktushose.jda.commands.dispatching.middleware.MiddlewareRegistry;
-import com.github.kaktushose.jda.commands.dispatching.middleware.Priority;
-import com.github.kaktushose.jda.commands.dispatching.middleware.impl.ConstraintMiddleware;
-import com.github.kaktushose.jda.commands.dispatching.middleware.impl.CooldownMiddleware;
-import com.github.kaktushose.jda.commands.dispatching.middleware.impl.PermissionsMiddleware;
-import com.github.kaktushose.jda.commands.dispatching.validation.ValidatorRegistry;
+import com.github.kaktushose.jda.commands.dispatching.middleware.internal.Middlewares;
+import com.github.kaktushose.jda.commands.embeds.error.ErrorMessageFactory;
 import com.github.kaktushose.jda.commands.internal.JDAContext;
 import com.github.kaktushose.jda.commands.internal.register.SlashCommandUpdater;
+import com.github.kaktushose.jda.commands.scope.GuildScopeProvider;
 import net.dv8tion.jda.api.JDA;
-import net.dv8tion.jda.api.interactions.commands.localization.LocalizationFunction;
-import net.dv8tion.jda.api.interactions.commands.localization.ResourceBundleLocalizationFunction;
 import net.dv8tion.jda.api.interactions.components.buttons.Button;
 import net.dv8tion.jda.api.interactions.components.selections.SelectMenu;
 import net.dv8tion.jda.api.sharding.ShardManager;
@@ -34,134 +27,88 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.Collection;
 
-public record JDACommands(
-        JDAContext jdaContext,
-        JDAEventListener JDAEventListener,
-        MiddlewareRegistry middlewareRegistry,
-        TypeAdapterRegistry adapterRegistry,
-        ValidatorRegistry validatorRegistry,
-        DependencyInjector dependencyInjector,
-        InteractionRegistry interactionRegistry,
-        SlashCommandUpdater updater) {
+/// The main entry point of the JDA-Commands framework. This class includes methods to manage the overall framework
+/// while running.
+///
+/// Instances of this class can be created by using one of the "start" or "builder" methods.
+public final class JDACommands {
     private static final Logger log = LoggerFactory.getLogger(JDACommands.class);
+    private final JDAContext jdaContext;
+    private final JDAEventListener jdaEventListener;
+    private final DependencyInjector dependencyInjector;
+    private final InteractionRegistry interactionRegistry;
+    private final SlashCommandUpdater updater;
+
+    JDACommands(
+            JDAContext jdaContext,
+            DependencyInjector dependencyInjector,
+            ExpirationStrategy expirationStrategy,
+            TypeAdapters typeAdapters,
+            Middlewares middlewares,
+            ErrorMessageFactory errorMessageFactory,
+            GuildScopeProvider guildScopeProvider,
+            InteractionRegistry interactionRegistry,
+            InteractionDefinition.ReplyConfig globalReplyConfig) {
+        this.jdaContext = jdaContext;
+        this.dependencyInjector = dependencyInjector;
+        this.interactionRegistry = interactionRegistry;
+        this.updater = new SlashCommandUpdater(jdaContext, guildScopeProvider, interactionRegistry);
+        this.jdaEventListener = new JDAEventListener(new DispatchingContext(middlewares, errorMessageFactory, interactionRegistry, typeAdapters, expirationStrategy, dependencyInjector, globalReplyConfig));
+    }
 
-    private static JDACommands startInternal(Object jda, Class<?> clazz, LocalizationFunction function, DependencyInjector dependencyInjector, ExpirationStrategy expirationStrategy, String[] packages) {
+    JDACommands start(Collection<ClassFinder> classFinders, Class<?> clazz, String[] packages) {
         log.info("Starting JDA-Commands...");
-
-        var jdaContext = new JDAContext(jda);
         dependencyInjector.index(clazz, packages);
-
-        var middlewareRegistry = new MiddlewareRegistry();
-        var adapterRegistry = new TypeAdapterRegistry();
-        var validatorRegistry = new ValidatorRegistry();
-        var implementationRegistry = new ImplementationRegistry(dependencyInjector, middlewareRegistry, adapterRegistry, validatorRegistry);
-        var interactionRegistry = new InteractionRegistry(dependencyInjector, validatorRegistry, function, new ReflectiveDescriptor());
-
-        middlewareRegistry.register(Priority.PERMISSIONS, new PermissionsMiddleware(implementationRegistry));
-        middlewareRegistry.register(Priority.NORMAL, new ConstraintMiddleware(implementationRegistry), new CooldownMiddleware(implementationRegistry));
-
-        var eventListener = new JDAEventListener(new DispatchingContext(middlewareRegistry, implementationRegistry, interactionRegistry, adapterRegistry, expirationStrategy));
-
-        implementationRegistry.index(clazz, packages);
-
-        interactionRegistry.index(ReflectiveClassFinder.find(clazz, packages));
-
-        var updater = new SlashCommandUpdater(jdaContext, implementationRegistry.getGuildScopeProvider(), interactionRegistry);
+        classFinders.forEach(classFinder -> interactionRegistry.index(classFinder.find()));
         updater.updateAllCommands();
 
-        jdaContext.performTask(it -> it.addEventListener(eventListener));
-
+        jdaContext.performTask(it -> it.addEventListener(jdaEventListener));
         log.info("Finished loading!");
-
-        return new JDACommands(
-                jdaContext,
-                eventListener,
-                middlewareRegistry,
-                adapterRegistry,
-                validatorRegistry,
-                dependencyInjector,
-                interactionRegistry,
-                updater
-        );
+        return this;
     }
 
-    /**
-     * Creates a new JDACommands instance and starts the frameworks.
-     *
-     * @param jda      the corresponding {@link JDA} instance
-     * @param clazz    a class of the classpath to scan
-     * @param packages package(s) to exclusively scan
-     * @return a new JDACommands instance
-     */
+    /// Creates a new JDACommands instance and starts the frameworks, including scanning the classpath for annotated classes.
+    /// This uses reflections for some functionality.
+    ///
+    /// @param jda      the corresponding [JDA] instance
+    /// @param clazz    a class of the classpath to scan
+    /// @param packages package(s) to exclusively scan
+    /// @return a new JDACommands instance
+    @NotNull
     public static JDACommands start(@NotNull JDA jda, @NotNull Class<?> clazz, @NotNull String... packages) {
-        return startInternal(jda, clazz, ResourceBundleLocalizationFunction.empty().build(), new DefaultDependencyInjector(), ExpirationStrategy.AFTER_15_MINUTES, packages);
+        return builder(jda, clazz, packages).start();
     }
 
-    /**
-     * Creates a new JDACommands instance and starts the frameworks.
-     *
-     * @param shardManager the corresponding {@link ShardManager} instance
-     * @param clazz        a class of the classpath to scan
-     * @param packages     package(s) to exclusively scan
-     * @return a new JDACommands instance
-     */
+    /// Creates a new JDACommands instance and starts the frameworks, including scanning the classpath for annotated classes.
+    /// This uses reflections for some functionality.
+    ///
+    /// @param shardManager the corresponding [ShardManager] instance
+    /// @param clazz        a class of the classpath to scan
+    /// @param packages     package(s) to exclusively scan
+    /// @return a new JDACommands instance
+    @NotNull
     public static JDACommands start(@NotNull ShardManager shardManager, @NotNull Class<?> clazz, @NotNull String... packages) {
-        return startInternal(shardManager, clazz, ResourceBundleLocalizationFunction.empty().build(), new DefaultDependencyInjector(), ExpirationStrategy.AFTER_15_MINUTES, packages);
+        return builder(shardManager, clazz, packages).start();
     }
 
-    /**
-     * Creates a new JDACommands instance and starts the frameworks.
-     *
-     * @param jda      the corresponding {@link JDA} instance
-     * @param clazz    a class of the classpath to scan
-     * @param function the {@link LocalizationFunction} to use
-     * @param packages package(s) to exclusively scan
-     * @return a new JDACommands instance
-     */
-    public static JDACommands start(@NotNull JDA jda, @NotNull Class<?> clazz, LocalizationFunction function, @NotNull String... packages) {
-        return startInternal(jda, clazz, function, new DefaultDependencyInjector(), ExpirationStrategy.AFTER_15_MINUTES, packages);
-    }
-
-    /**
-     * Creates a new JDACommands instance and starts the frameworks.
-     *
-     * @param shardManager the corresponding {@link ShardManager} instance
-     * @param clazz        a class of the classpath to scan
-     * @param function     the {@link LocalizationFunction} to use
-     * @param packages     package(s) to exclusively scan
-     * @return a new JDACommands instance
-     */
-    public static JDACommands start(@NotNull ShardManager shardManager, @NotNull Class<?> clazz, LocalizationFunction function, @NotNull String... packages) {
-        return startInternal(shardManager, clazz, function, new DefaultDependencyInjector(), ExpirationStrategy.AFTER_15_MINUTES, packages);
-    }
-
-    /**
-     * Creates a new JDACommands instance and starts the frameworks.
-     *
-     * @param jda      the corresponding {@link JDA} instance
-     * @param clazz    a class of the classpath to scan
-     * @param function the {@link LocalizationFunction} to use
-     * @param injector the {@link DependencyInjector} implementation to use
-     * @param packages package(s) to exclusively scan
-     * @return a new JDACommands instance
-     */
-    public static JDACommands start(@NotNull JDA jda, @NotNull Class<?> clazz, LocalizationFunction function, DependencyInjector injector, ExpirationStrategy expirationStrategy, @NotNull String... packages) {
-        return startInternal(jda, clazz, function, injector, expirationStrategy, packages);
+    /// Create a new builder.
+    /// @param jda      the corresponding [JDA] instance
+    /// @param clazz    a class of the classpath to scan
+    /// @param packages package(s) to exclusively scan
+    /// @return a new [JDACommandsBuilder]
+    @NotNull
+    public static JDACommandsBuilder builder(@NotNull JDA jda, @NotNull Class<?> clazz, @NotNull String... packages) {
+        return new JDACommandsBuilder(new JDAContext(jda), clazz, packages);
     }
 
-    /**
-     * Creates a new JDACommands instance and starts the frameworks.
-     *
-     * @param shardManager the corresponding {@link ShardManager} instance
-     * @param clazz        a class of the classpath to scan
-     * @param function     the {@link LocalizationFunction} to use
-     * @param injector     the {@link DependencyInjector} implementation to use
-     * @param packages     package(s) to exclusively scan
-     * @return a new JDACommands instance
-     */
-    public static JDACommands start(@NotNull ShardManager shardManager, @NotNull Class<?> clazz, LocalizationFunction function, DependencyInjector injector, ExpirationStrategy expirationStrategy, @NotNull String... packages) {
-        return startInternal(shardManager, clazz, function, injector, expirationStrategy, packages);
+    /// Create a new builder.
+    /// @param shardManager      the corresponding [ShardManager] instance
+    /// @return a new [JDACommandsBuilder]
+    @NotNull
+    public static JDACommandsBuilder builder(@NotNull ShardManager shardManager, @NotNull Class<?> clazz, @NotNull String... packages) {
+        return new JDACommandsBuilder(new JDAContext(shardManager), clazz, packages);
     }
 
     /**
@@ -169,14 +116,10 @@ public static JDACommands start(@NotNull ShardManager shardManager, @NotNull Cla
      * This will <b>not</b> unregister any slash commands.
      */
     public void shutdown() {
-        jdaContext.performTask(jda -> jda.removeEventListener(JDAEventListener));
+        jdaContext.performTask(jda -> jda.removeEventListener(jdaEventListener));
     }
 
-    /**
-     * Updates all slash commands that are registered with
-     * {@link CommandScope#GUILD
-     * CommandScope#Guild}
-     */
+    /// Updates all slash commands that are registered with [CommandScope#GUILD]
     public void updateGuildCommands() {
         updater.updateGuildCommands();
     }
@@ -187,7 +130,7 @@ public void updateGuildCommands() {
     /// The button will be [`Runtime`]({@docRoot}/index.html#runtime-concept-heading) independent. This may be useful if you want to send a message without
     /// using the framework.
     ///
-    /// @param button the name of the button
+    /// @param button the name of the button in the format `FullClassNameWithPackage.method``
     /// @return the JDA [Button]
     @NotNull
     public Button getButton(@NotNull String button) {
@@ -201,12 +144,14 @@ public Button getButton(@NotNull String button) {
     /// The select menu will be [`Runtime`]({@docRoot}/index.html#runtime-concept-heading) independent. This may be useful if you want to send a component
     /// without using the framework.
     ///
-    /// @param menu the name of the select menu
+    /// @param menu the name of the button in the format `FullClassNameWithPackage.method``
     /// @return the JDA [SelectMenu]
+    @SuppressWarnings("unchecked")
     @NotNull
     public SelectMenu getSelectMenu(@NotNull String menu) {
         var id = String.valueOf(menu.replaceAll("\\.", "").hashCode());
         var definition = interactionRegistry.find(SelectMenuDefinition.class, false, it -> it.definitionId().equals(id));
         return (SelectMenu) definition.toJDAEntity(CustomId.independent(definition.definitionId()));
     }
+
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/JDACommandsBuilder.java b/src/main/java/com/github/kaktushose/jda/commands/JDACommandsBuilder.java
new file mode 100644
index 000000000..c1afd9235
--- /dev/null
+++ b/src/main/java/com/github/kaktushose/jda/commands/JDACommandsBuilder.java
@@ -0,0 +1,200 @@
+package com.github.kaktushose.jda.commands;
+
+import com.github.kaktushose.jda.commands.annotations.interactions.Interaction;
+import com.github.kaktushose.jda.commands.definitions.description.ClassFinder;
+import com.github.kaktushose.jda.commands.definitions.description.Descriptor;
+import com.github.kaktushose.jda.commands.definitions.description.reflective.ReflectiveDescriptor;
+import com.github.kaktushose.jda.commands.definitions.interactions.InteractionDefinition.ReplyConfig;
+import com.github.kaktushose.jda.commands.definitions.interactions.InteractionRegistry;
+import com.github.kaktushose.jda.commands.dependency.DefaultDependencyInjector;
+import com.github.kaktushose.jda.commands.dependency.DependencyInjector;
+import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapter;
+import com.github.kaktushose.jda.commands.dispatching.adapter.internal.TypeAdapters;
+import com.github.kaktushose.jda.commands.dispatching.expiration.ExpirationStrategy;
+import com.github.kaktushose.jda.commands.dispatching.middleware.Middleware;
+import com.github.kaktushose.jda.commands.dispatching.middleware.Priority;
+import com.github.kaktushose.jda.commands.dispatching.middleware.internal.Middlewares;
+import com.github.kaktushose.jda.commands.dispatching.validation.Validator;
+import com.github.kaktushose.jda.commands.dispatching.validation.internal.Validators;
+import com.github.kaktushose.jda.commands.embeds.error.DefaultErrorMessageFactory;
+import com.github.kaktushose.jda.commands.embeds.error.ErrorMessageFactory;
+import com.github.kaktushose.jda.commands.internal.JDAContext;
+import com.github.kaktushose.jda.commands.permissions.DefaultPermissionsProvider;
+import com.github.kaktushose.jda.commands.permissions.PermissionsProvider;
+import com.github.kaktushose.jda.commands.scope.DefaultGuildScopeProvider;
+import com.github.kaktushose.jda.commands.scope.GuildScopeProvider;
+import net.dv8tion.jda.api.interactions.commands.localization.LocalizationFunction;
+import net.dv8tion.jda.api.interactions.commands.localization.ResourceBundleLocalizationFunction;
+import org.jetbrains.annotations.NotNull;
+
+import java.lang.annotation.Annotation;
+import java.util.*;
+
+/// This builder is used to build instances of [JDACommands].
+///
+/// Please note that values that can be set have a default implementation;
+/// These default implementations are sometimes bases on reflections. If you want to avoid reflections, you have to provide your own implementations for:
+/// - [#descriptor(com.github.kaktushose.jda.commands.definitions.description.Descriptor)]
+/// - [#classFinders(ClassFinder...)]
+/// - [#dependencyInjector(DependencyInjector)]
+///
+/// ## Example
+/// ```java
+/// JDACommands jdaCommands = JDACommands.builder(jda, Main.class)
+///     .middleware(Priority.NORMAL, new TestMiddleware())
+///     .globalReplyConfig(new InteractionDefinition.ReplyConfig(false, false, true))
+///     .classFinders(ClassFinder.reflective(Main.class), ClassFinders.explicit(ButtonInteraction.class))
+///     .start();
+/// ```
+///
+public class JDACommandsBuilder {
+    private final Class<?> baseClass;
+    private final String[] packages;
+    private final JDAContext context;
+
+    private LocalizationFunction localizationFunction = ResourceBundleLocalizationFunction.empty().build();
+    private DependencyInjector dependencyInjector = new DefaultDependencyInjector();
+    private ExpirationStrategy expirationStrategy = ExpirationStrategy.AFTER_15_MINUTES;
+
+    private PermissionsProvider permissionsProvider = new DefaultPermissionsProvider();
+    private ErrorMessageFactory errorMessageFactory = new DefaultErrorMessageFactory();
+    private GuildScopeProvider guildScopeProvider = new DefaultGuildScopeProvider();
+
+    private Collection<ClassFinder> classFinders;
+    private Descriptor descriptor = new ReflectiveDescriptor();
+
+    private ReplyConfig globalReplyConfig = new ReplyConfig();
+
+    // registries
+    private final Map<Class<?>, TypeAdapter<?>> typeAdapters = new HashMap<>();
+    private final Set<Map.Entry<Priority, Middleware>> middlewares = new HashSet<>();
+    private final Map<Class<? extends Annotation>, Validator> validators = new HashMap<>();
+
+
+    JDACommandsBuilder(@NotNull JDAContext context, @NotNull Class<?> baseClass, @NotNull String[] packages) {
+        this.baseClass = baseClass;
+        this.packages = packages;
+        this.context = Objects.requireNonNull(context);
+        this.classFinders = List.of(ClassFinder.reflective(baseClass, packages));
+    }
+
+
+    /// @param classFinders the to be used [ClassFinder]s
+    ///
+    /// @apiNote This method overrides the underlying collection instead of adding to it.
+    /// If you want to add own [ClassFinder]s while keeping the default reflective implementation, you have to add it explicitly via
+    /// [ClassFinder#reflective(Class, String...)] too.
+    ///
+    @NotNull
+    public JDACommandsBuilder classFinders(@NotNull ClassFinder... classFinders) {
+        this.classFinders = Arrays.asList(classFinders);
+        return this;
+    }
+
+    /// @param descriptor the [Descriptor] to be used
+    @NotNull
+    public JDACommandsBuilder descriptor(@NotNull Descriptor descriptor) {
+        this.descriptor = descriptor;
+        return this;
+    }
+
+    /// @param localizationFunction The [LocalizationFunction] to be used to localize interactions
+    @NotNull
+    public JDACommandsBuilder localizationFunction(@NotNull LocalizationFunction localizationFunction) {
+        this.localizationFunction = Objects.requireNonNull(localizationFunction);
+        return this;
+    }
+
+    /// @param dependencyInjector The [DependencyInjector] that should be used to instantiate instances of the user defined Interactions [Interaction]
+    @NotNull
+    public JDACommandsBuilder dependencyInjector(@NotNull DependencyInjector dependencyInjector) {
+        this.dependencyInjector = Objects.requireNonNull(dependencyInjector);
+        return this;
+    }
+
+    /// @param expirationStrategy The [ExpirationStrategy] to be used
+    @NotNull
+    public JDACommandsBuilder expirationStrategy(@NotNull ExpirationStrategy expirationStrategy) {
+        this.expirationStrategy = Objects.requireNonNull(expirationStrategy);
+        return this;
+    }
+
+    /// @param priority   The [Priority] with what the [Middleware] should be registered
+    /// @param middleware The to be registered [Middleware]
+    @NotNull
+    public JDACommandsBuilder middleware(@NotNull Priority priority, @NotNull Middleware middleware) {
+        Objects.requireNonNull(priority);
+        Objects.requireNonNull(middleware);
+
+        middlewares.add(Map.entry(priority, middleware));
+        return this;
+    }
+
+    /// @param type    The type that the given [TypeAdapter] can handle
+    /// @param adapter The [TypeAdapter] to be registered
+    @NotNull
+    public JDACommandsBuilder adapter(@NotNull Class<?> type, @NotNull TypeAdapter<?> adapter) {
+        Objects.requireNonNull(type);
+        Objects.requireNonNull(adapter);
+
+        typeAdapters.put(type, adapter);
+        return this;
+    }
+
+    /// @param annotation The annotation for which the given [Validator] should be called
+    /// @param validator  The [Validator] to be registered
+    @NotNull
+    public JDACommandsBuilder validator(@NotNull Class<? extends Annotation> annotation, @NotNull Validator validator) {
+        Objects.requireNonNull(annotation);
+        Objects.requireNonNull(validator);
+
+        validators.put(annotation, validator);
+        return this;
+    }
+
+    /// @param permissionsProvider The [PermissionsProvider] that should be used
+    @NotNull
+    public JDACommandsBuilder permissionsProvider(@NotNull PermissionsProvider permissionsProvider) {
+        this.permissionsProvider = Objects.requireNonNull(permissionsProvider);
+        return this;
+    }
+
+    /// @param errorMessageFactory The [ErrorMessageFactory] that should be used
+    @NotNull
+    public JDACommandsBuilder errorMessageFactory(@NotNull ErrorMessageFactory errorMessageFactory) {
+        this.errorMessageFactory = Objects.requireNonNull(errorMessageFactory);
+        return this;
+    }
+
+    /// @param guildScopeProvider The [GuildScopeProvider] that should be used
+    @NotNull
+    public JDACommandsBuilder guildScopeProvider(@NotNull GuildScopeProvider guildScopeProvider) {
+        this.guildScopeProvider = Objects.requireNonNull(guildScopeProvider);
+        return this;
+    }
+
+    /// @param globalReplyConfig the [ReplyConfig] to be used as a global fallback option
+    @NotNull
+    public JDACommandsBuilder globalReplyConfig(@NotNull ReplyConfig globalReplyConfig) {
+        this.globalReplyConfig = globalReplyConfig;
+        return this;
+    }
+
+    /// This method instantiates an instance of [JDACommands] and starts the framework.
+    @NotNull
+    public JDACommands start() {
+        JDACommands jdaCommands = new JDACommands(
+                context,
+                dependencyInjector,
+                expirationStrategy,
+                new TypeAdapters(typeAdapters),
+                new Middlewares(middlewares, errorMessageFactory, permissionsProvider),
+                errorMessageFactory,
+                guildScopeProvider,
+                new InteractionRegistry(dependencyInjector, new Validators(this.validators), localizationFunction, descriptor),
+                globalReplyConfig
+        );
+
+        return jdaCommands.start(classFinders, baseClass, packages);
+    }
+}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/annotations/Implementation.java b/src/main/java/com/github/kaktushose/jda/commands/annotations/Implementation.java
index 6df27a324..5efb5eb78 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/annotations/Implementation.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/annotations/Implementation.java
@@ -1,7 +1,6 @@
 package com.github.kaktushose.jda.commands.annotations;
 
 import com.github.kaktushose.jda.commands.annotations.constraints.Constraint;
-import com.github.kaktushose.jda.commands.dispatching.ImplementationRegistry;
 import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapter;
 import com.github.kaktushose.jda.commands.dispatching.middleware.Middleware;
 import com.github.kaktushose.jda.commands.dispatching.middleware.Priority;
@@ -14,7 +13,7 @@
 
 /// Indicates that the annotated class is a custom implementation that should replace the default implementation.
 ///
-/// @see ImplementationRegistry
+/// @see "ImplementationRegistry -> TBD DI"
 /// @see Middleware
 /// @see Validator
 /// @see TypeAdapter
diff --git a/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/Constraint.java b/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/Constraint.java
index e27e1eb5f..8fee1f78c 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/Constraint.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/Constraint.java
@@ -8,7 +8,7 @@
 /// Indicates that an annotation type can be used for parameter validation. When implementing custom validators, the
 /// annotation type must be annotated with this annotation.
 ///
-/// @see com.github.kaktushose.jda.commands.dispatching.validation.ValidatorRegistry ValidatorRegistry
+/// @see com.github.kaktushose.jda.commands.dispatching.validation.internal.Validators Validators
 @Target(ElementType.ANNOTATION_TYPE)
 @Retention(RetentionPolicy.RUNTIME)
 public @interface Constraint {
diff --git a/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/NotRole.java b/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/NotRole.java
index 32adef342..66b7b1d0f 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/NotRole.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/NotRole.java
@@ -1,6 +1,6 @@
 package com.github.kaktushose.jda.commands.annotations.constraints;
 
-import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapterRegistry;
+import com.github.kaktushose.jda.commands.dispatching.adapter.internal.TypeAdapters;
 import net.dv8tion.jda.api.entities.Member;
 
 import java.lang.annotation.ElementType;
@@ -9,7 +9,7 @@
 import java.lang.annotation.Target;
 
 /// The annotated element must be member that **doesn't** have the specified guild role. This constraint will use the
-/// [TypeAdapterRegistry] to determine the role.
+/// [TypeAdapters] to determine the role.
 ///
 /// @see Constraint
 /// @see com.github.kaktushose.jda.commands.dispatching.adapter.impl.RoleAdapter RoleAdapter
diff --git a/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/NotUser.java b/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/NotUser.java
index 809e22045..d0630d617 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/NotUser.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/NotUser.java
@@ -1,7 +1,8 @@
 package com.github.kaktushose.jda.commands.annotations.constraints;
 
-import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapterRegistry;
+
 import com.github.kaktushose.jda.commands.dispatching.adapter.impl.RoleAdapter;
+import com.github.kaktushose.jda.commands.dispatching.adapter.internal.TypeAdapters;
 import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.User;
 
@@ -11,7 +12,7 @@
 import java.lang.annotation.Target;
 
 /// The annotated element must **not** be the specified user or member. This constraint will use the
-/// [TypeAdapterRegistry] to determine the user or member.
+/// [TypeAdapters] to determine the user or member.
 ///
 /// @see Constraint
 /// @see RoleAdapter
diff --git a/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/Role.java b/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/Role.java
index 58a1a8108..d0ff8eb51 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/Role.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/Role.java
@@ -1,7 +1,7 @@
 package com.github.kaktushose.jda.commands.annotations.constraints;
 
-import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapterRegistry;
 import com.github.kaktushose.jda.commands.dispatching.adapter.impl.RoleAdapter;
+import com.github.kaktushose.jda.commands.dispatching.adapter.internal.TypeAdapters;
 import net.dv8tion.jda.api.entities.Member;
 
 import java.lang.annotation.ElementType;
@@ -10,7 +10,7 @@
 import java.lang.annotation.Target;
 
 /// The annotated element must be member that have the specified guild role. This constraint will use the
-/// [TypeAdapterRegistry] to determine the role.
+/// [TypeAdapters] to determine the role.
 ///
 /// @see Constraint
 /// @see RoleAdapter
diff --git a/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/User.java b/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/User.java
index 048cad8b1..dec7f4a2a 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/User.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/User.java
@@ -1,7 +1,7 @@
 package com.github.kaktushose.jda.commands.annotations.constraints;
 
-import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapterRegistry;
 import com.github.kaktushose.jda.commands.dispatching.adapter.impl.RoleAdapter;
+import com.github.kaktushose.jda.commands.dispatching.adapter.internal.TypeAdapters;
 import net.dv8tion.jda.api.entities.Member;
 
 import java.lang.annotation.ElementType;
@@ -9,8 +9,10 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+
+
 /// The annotated element must be the specified user or member. This constraint will use the
-/// [TypeAdapterRegistry] to determine the user or member.
+/// [TypeAdapters] to determine the user or member.
 ///
 /// @see Constraint
 /// @see RoleAdapter
diff --git a/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Optional.java b/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Optional.java
index ecf9c1860..ddabc7603 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Optional.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Optional.java
@@ -1,6 +1,6 @@
 package com.github.kaktushose.jda.commands.annotations.interactions;
 
-import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapterRegistry;
+import com.github.kaktushose.jda.commands.dispatching.adapter.internal.TypeAdapters;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -13,7 +13,7 @@
 /// command.
 ///
 /// It is also possible to pass a default value which will be used instead if the argument isn't present.
-/// The default value will be handled as a normal input and thus the [TypeAdapterRegistry] will try to parse it.
+/// The default value will be handled as a normal input and thus the [TypeAdapters] will try to parse it.
 /// If the parsing fails the command will still be executed but with empty or possible `null` values.
 ///
 /// @see SlashCommand
diff --git a/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/ReplyConfig.java b/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/ReplyConfig.java
index 6189759b6..7ff07f06d 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/ReplyConfig.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/ReplyConfig.java
@@ -1,8 +1,8 @@
 package com.github.kaktushose.jda.commands.annotations.interactions;
 
+import com.github.kaktushose.jda.commands.JDACommandsBuilder;
 import com.github.kaktushose.jda.commands.dispatching.events.ReplyableEvent;
 import com.github.kaktushose.jda.commands.dispatching.reply.ConfigurableReply;
-import com.github.kaktushose.jda.commands.dispatching.reply.GlobalReplyConfig;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -14,7 +14,8 @@
 /// Interaction methods annotated with [ReplyConfig] will use the configured values of this annotation when sending a reply.
 /// Interaction classes annotated with [ReplyConfig] will apply the configured values of this annotation to
 /// every method, if and only if no annotation is present at method level. If the [ReplyConfig] annotation is neither
-/// present at the class level nor the method level, the [GlobalReplyConfig] will be used instead.
+/// present at the class level nor the method level, the global [`ReplyConfig`][com.github.kaktushose.jda.commands.definitions.interactions.InteractionDefinition.ReplyConfig]
+///  will be used instead.
 ///
 /// **These values are always overridden by [ConfigurableReply#ephemeral(boolean)],
 /// [ConfigurableReply#keepComponents(boolean)] or respectively [ConfigurableReply#editReply(boolean)].**
@@ -23,7 +24,7 @@
 /// 1. [ConfigurableReply]
 /// 2. [ReplyConfig] method annotation
 /// 3. [ReplyConfig] class annotation
-/// 4. [GlobalReplyConfig]
+/// 4. global [`ReplyConfig`][com.github.kaktushose.jda.commands.definitions.interactions.InteractionDefinition.ReplyConfig] provided in [JDACommandsBuilder]
 ///
 /// @see ReplyableEvent
 @Target({ElementType.TYPE, ElementType.METHOD})
diff --git a/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/SlashCommand.java b/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/SlashCommand.java
index de40f4898..191ee9281 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/SlashCommand.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/SlashCommand.java
@@ -1,6 +1,6 @@
 package com.github.kaktushose.jda.commands.annotations.interactions;
 
-import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapterRegistry;
+import com.github.kaktushose.jda.commands.dispatching.adapter.internal.TypeAdapters;
 import com.github.kaktushose.jda.commands.dispatching.events.interactions.CommandEvent;
 import net.dv8tion.jda.api.Permission;
 
@@ -15,7 +15,7 @@
 /// Furthermore, the method signature has to meet the following conditions:
 ///
 ///   - First parameter must be of type [CommandEvent]
-///   - Remaining parameter types must be registered at the [TypeAdapterRegistry]
+///   - Remaining parameter types must be registered at the [TypeAdapters]
 ///   - or the second parameter is a String array
 ///
 /// ## Examples:
diff --git a/src/main/java/com/github/kaktushose/jda/commands/definitions/description/ClassDescription.java b/src/main/java/com/github/kaktushose/jda/commands/definitions/description/ClassDescription.java
index e64468bc6..f6cd131b7 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/definitions/description/ClassDescription.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/definitions/description/ClassDescription.java
@@ -4,11 +4,12 @@
 
 import java.lang.annotation.Annotation;
 import java.util.Collection;
+import java.util.Collections;
 
 /// A [Description] that describes a class.
 ///
 /// @param clazz       the [Class] this [Description] describes.
-/// @param name        the name of the class
+/// @param name        the full name including packages of the class
 /// @param annotations a [Collection] of all [Annotation]s this class is annotated with
 /// @param methods     a [Collection] of all the public [`methods`][MethodDescription] of this class
 public record ClassDescription(
@@ -16,4 +17,11 @@ public record ClassDescription(
         @NotNull String name,
         @NotNull Collection<Annotation> annotations,
         @NotNull Collection<MethodDescription> methods
-) implements Description {}
+) implements Description {
+    public ClassDescription(@NotNull Class<?> clazz, @NotNull String name, @NotNull Collection<Annotation> annotations, @NotNull Collection<MethodDescription> methods) {
+        this.clazz = clazz;
+        this.name = name;
+        this.annotations = Collections.unmodifiableCollection(annotations);
+        this.methods = Collections.unmodifiableCollection(methods);
+    }
+}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/definitions/description/ClassFinder.java b/src/main/java/com/github/kaktushose/jda/commands/definitions/description/ClassFinder.java
new file mode 100644
index 000000000..9afd70043
--- /dev/null
+++ b/src/main/java/com/github/kaktushose/jda/commands/definitions/description/ClassFinder.java
@@ -0,0 +1,31 @@
+package com.github.kaktushose.jda.commands.definitions.description;
+
+import com.github.kaktushose.jda.commands.annotations.interactions.Interaction;
+import com.github.kaktushose.jda.commands.definitions.description.reflective.ReflectiveClassFinder;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Arrays;
+
+/// [ClassFinder]s provide instances of [Class] that will be scanned for [Interaction]s
+public interface ClassFinder {
+
+    /// @return the classes to be searched for [Interaction]
+    @NotNull
+    Iterable<Class<?>> find();
+
+    /// This provides a reflections based implementation of [ClassFinder]
+    ///
+    /// @param baseClass The [Class] providing the used [ClassLoader]
+    /// @param packages a list of packages that should be scanned
+    @NotNull
+    static ClassFinder reflective(@NotNull Class<?> baseClass, @NotNull String... packages) {
+        return new ReflectiveClassFinder(baseClass, packages);
+    }
+
+    /// This provides an array backed implementation of [ClassFinder] that just returns the explicitly stated classes.
+    /// @param classes the classes to be scanned
+    @NotNull
+    static ClassFinder explicit(@NotNull Class<?>... classes) {
+        return () -> Arrays.asList(classes);
+    }
+}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/definitions/description/MethodDescription.java b/src/main/java/com/github/kaktushose/jda/commands/definitions/description/MethodDescription.java
index acc28bcc2..e1bc8264b 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/definitions/description/MethodDescription.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/definitions/description/MethodDescription.java
@@ -4,6 +4,7 @@
 
 import java.lang.annotation.Annotation;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.SequencedCollection;
 
 /// A [Description] that describes a method.
@@ -22,4 +23,12 @@ public record MethodDescription(
         @NotNull Collection<Annotation> annotations,
         @NotNull Invoker invoker
 ) implements Description {
+    public MethodDescription(@NotNull Class<?> declaringClass, @NotNull Class<?> returnType, @NotNull String name, @NotNull SequencedCollection<ParameterDescription> parameters, @NotNull Collection<Annotation> annotations, @NotNull Invoker invoker) {
+        this.declaringClass = declaringClass;
+        this.returnType = returnType;
+        this.name = name;
+        this.parameters = Collections.unmodifiableSequencedCollection(parameters);
+        this.annotations = Collections.unmodifiableCollection(annotations);
+        this.invoker = invoker;
+    }
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/definitions/description/ParameterDescription.java b/src/main/java/com/github/kaktushose/jda/commands/definitions/description/ParameterDescription.java
index 3816c2273..968c7c124 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/definitions/description/ParameterDescription.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/definitions/description/ParameterDescription.java
@@ -4,6 +4,7 @@
 
 import java.lang.annotation.Annotation;
 import java.util.Collection;
+import java.util.Collections;
 
 /// A [Description] that describes a parameter.
 ///
@@ -14,4 +15,10 @@ public record ParameterDescription(
         @NotNull Class<?> type,
         @NotNull String name,
         @NotNull Collection<Annotation> annotations
-) implements Description {}
+) implements Description {
+    public ParameterDescription(@NotNull Class<?> type, @NotNull String name, @NotNull Collection<Annotation> annotations) {
+        this.type = type;
+        this.name = name;
+        this.annotations = Collections.unmodifiableCollection(annotations);
+    }
+}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/definitions/description/reflective/ReflectiveClassFinder.java b/src/main/java/com/github/kaktushose/jda/commands/definitions/description/reflective/ReflectiveClassFinder.java
index 3da9ea859..a1001b475 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/definitions/description/reflective/ReflectiveClassFinder.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/definitions/description/reflective/ReflectiveClassFinder.java
@@ -1,7 +1,9 @@
 package com.github.kaktushose.jda.commands.definitions.description.reflective;
 
 import com.github.kaktushose.jda.commands.annotations.interactions.Interaction;
+import com.github.kaktushose.jda.commands.definitions.description.ClassFinder;
 import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.NotNull;
 import org.reflections.Reflections;
 import org.reflections.scanners.Scanners;
 import org.reflections.util.ClasspathHelper;
@@ -10,9 +12,18 @@
 
 // temp class
 @ApiStatus.Internal
-public class ReflectiveClassFinder {
+public class ReflectiveClassFinder implements ClassFinder {
 
-    public static Iterable<Class<?>> find(Class<?> clazz, String[] packages) {
+    private final Class<?> clazz;
+    private final String[] packages;
+
+    public ReflectiveClassFinder(Class<?> clazz, String[] packages) {
+        this.clazz = clazz;
+        this.packages = packages;
+    }
+
+    @Override
+    public @NotNull Iterable<Class<?>> find() {
         var filter = new FilterBuilder();
         for (String pkg : packages) {
             filter.includePackage(pkg);
diff --git a/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/InteractionDefinition.java b/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/InteractionDefinition.java
index 4ac5c32a8..4bcaaf070 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/InteractionDefinition.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/InteractionDefinition.java
@@ -11,7 +11,6 @@
 import com.github.kaktushose.jda.commands.definitions.interactions.component.menu.EntitySelectMenuDefinition;
 import com.github.kaktushose.jda.commands.definitions.interactions.component.menu.StringSelectMenuDefinition;
 import com.github.kaktushose.jda.commands.dispatching.middleware.impl.PermissionsMiddleware;
-import com.github.kaktushose.jda.commands.dispatching.reply.GlobalReplyConfig;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 
@@ -58,17 +57,17 @@ default Object newInstance() throws InvocationTargetException, InstantiationExce
     /// The [ReplyConfig] that should be used when sending replies.
     ///
     /// @implNote This will first attempt to use the [`ReplyConfig`][com.github.kaktushose.jda.commands.annotations.interactions.ReplyConfig]
-    /// annotation of the method and then of the class. If neither is present will fall back to the [GlobalReplyConfig].
+    /// annotation of the method and then of the class. If neither is present will fall back to the global [ReplyConfig] provided by [com.github.kaktushose.jda.commands.JDACommandsBuilder]
     @NotNull
-    default ReplyConfig replyConfig() {
-        var global = clazzDescription().annotation(com.github.kaktushose.jda.commands.annotations.interactions.ReplyConfig.class);
-        var local = methodDescription().annotation(com.github.kaktushose.jda.commands.annotations.interactions.ReplyConfig.class);
+    default ReplyConfig replyConfig(@NotNull ReplyConfig globalFallback) {
+        var clazz = clazzDescription().annotation(com.github.kaktushose.jda.commands.annotations.interactions.ReplyConfig.class);
+        var method = methodDescription().annotation(com.github.kaktushose.jda.commands.annotations.interactions.ReplyConfig.class);
 
-        if (global.isEmpty() && local.isEmpty()) {
-            return new ReplyConfig();
+        if (clazz.isEmpty() && method.isEmpty()) {
+            return globalFallback;
         }
 
-        return local.map(ReplyConfig::new).orElseGet(() -> new ReplyConfig(global.get()));
+        return method.map(ReplyConfig::new).orElseGet(() -> new ReplyConfig(clazz.get()));
 
     }
 
@@ -78,9 +77,12 @@ default ReplyConfig replyConfig() {
     /// @see com.github.kaktushose.jda.commands.annotations.interactions.ReplyConfig ReplyConfig
     record ReplyConfig(boolean ephemeral, boolean keepComponents, boolean editReply) {
 
-        /// Constructs a new ReplyConfig using the default values specified by [GlobalReplyConfig].
+        /// Constructs a new [ReplyConfig] using the following default values:
+        /// - ephemeral: `false`
+        /// - keepComponents: `true`
+        /// - editReply: `true`
         public ReplyConfig() {
-            this(GlobalReplyConfig.ephemeral, GlobalReplyConfig.keepComponents, GlobalReplyConfig.editReply);
+            this(false, true, true);
         }
 
         /// Constructs a new ReplyConfig.
diff --git a/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/InteractionRegistry.java b/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/InteractionRegistry.java
index 67bce5390..754eca221 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/InteractionRegistry.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/InteractionRegistry.java
@@ -12,8 +12,9 @@
 import com.github.kaktushose.jda.commands.definitions.interactions.component.menu.EntitySelectMenuDefinition;
 import com.github.kaktushose.jda.commands.definitions.interactions.component.menu.StringSelectMenuDefinition;
 import com.github.kaktushose.jda.commands.dependency.DependencyInjector;
-import com.github.kaktushose.jda.commands.dispatching.validation.ValidatorRegistry;
+import com.github.kaktushose.jda.commands.dispatching.validation.internal.Validators;
 import net.dv8tion.jda.api.interactions.commands.localization.LocalizationFunction;
+import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -24,11 +25,11 @@
 import static com.github.kaktushose.jda.commands.definitions.interactions.command.SlashCommandDefinition.CooldownDefinition;
 
 /// Central registry for all [InteractionDefinition]s.
-public record InteractionRegistry(DependencyInjector dependencyInjector,
-                                  ValidatorRegistry validatorRegistry,
-                                  LocalizationFunction localizationFunction,
-                                  Descriptor descriptor,
-                                  Set<Definition> definitions
+public record InteractionRegistry(@NotNull DependencyInjector dependencyInjector,
+                                  @NotNull Validators validators,
+                                  @NotNull LocalizationFunction localizationFunction,
+                                  @NotNull Descriptor descriptor,
+                                  @NotNull Set<Definition> definitions
 ) {
 
     private static final Logger log = LoggerFactory.getLogger(InteractionRegistry.class);
@@ -36,10 +37,10 @@ public record InteractionRegistry(DependencyInjector dependencyInjector,
     /// Constructs a new [InteractionRegistry]
     ///
     /// @param injector   the [DependencyInjector] to use
-    /// @param registry   the corresponding [ValidatorRegistry]
+    /// @param registry   the corresponding [Validators]
     /// @param function   the [LocalizationFunction] to use
     /// @param descriptor the [Descriptor] to use
-    public InteractionRegistry(DependencyInjector injector, ValidatorRegistry registry, LocalizationFunction function, Descriptor descriptor) {
+    public InteractionRegistry(DependencyInjector injector, Validators registry, LocalizationFunction function, Descriptor descriptor) {
         this(injector, registry, function, descriptor, new HashSet<>());
     }
 
@@ -78,7 +79,7 @@ private Collection<Definition> indexInteractionClass(ClassDescription clazz) {
         // index interactions
         var interactionDefinitions = interactionDefinitions(
                 clazz,
-                validatorRegistry,
+                validators,
                 localizationFunction,
                 interaction,
                 permissions,
@@ -111,7 +112,7 @@ private Collection<AutoCompleteDefinition> autoCompleteDefinitions(ClassDescript
     }
 
     private Set<Definition> interactionDefinitions(ClassDescription clazz,
-                                                   ValidatorRegistry validatorRegistry,
+                                                   Validators validators,
                                                    LocalizationFunction localizationFunction,
                                                    Interaction interaction,
                                                    Set<String> permissions,
@@ -120,7 +121,7 @@ private Set<Definition> interactionDefinitions(ClassDescription clazz,
         Set<Definition> definitions = new HashSet<>(autocompletes);
         for (MethodDescription method : clazz.methods()) {
             final MethodBuildContext context = new MethodBuildContext(
-                    validatorRegistry,
+                    validators,
                     localizationFunction,
                     interaction,
                     permissions,
diff --git a/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/MethodBuildContext.java b/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/MethodBuildContext.java
index 5f7c0717f..db35277a4 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/MethodBuildContext.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/MethodBuildContext.java
@@ -4,7 +4,7 @@
 import com.github.kaktushose.jda.commands.definitions.description.ClassDescription;
 import com.github.kaktushose.jda.commands.definitions.description.MethodDescription;
 import com.github.kaktushose.jda.commands.definitions.interactions.command.SlashCommandDefinition.CooldownDefinition;
-import com.github.kaktushose.jda.commands.dispatching.validation.ValidatorRegistry;
+import com.github.kaktushose.jda.commands.dispatching.validation.internal.Validators;
 import net.dv8tion.jda.api.interactions.commands.localization.LocalizationFunction;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
@@ -16,9 +16,9 @@
 /// Holds all objects needed to create an [InteractionDefinition].
 @ApiStatus.Internal
 public record MethodBuildContext(
-        @NotNull ValidatorRegistry validatorRegistry,
+        @NotNull Validators validators,
         @NotNull LocalizationFunction localizationFunction,
-        Interaction interaction,
+        @NotNull Interaction interaction,
         @NotNull Set<String> permissions,
         @Nullable CooldownDefinition cooldownDefinition,
         @NotNull ClassDescription clazz,
diff --git a/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/OptionDataDefinition.java b/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/OptionDataDefinition.java
index 59116a286..6ca11cf08 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/OptionDataDefinition.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/OptionDataDefinition.java
@@ -9,7 +9,7 @@
 import com.github.kaktushose.jda.commands.definitions.description.ParameterDescription;
 import com.github.kaktushose.jda.commands.definitions.features.JDAEntity;
 import com.github.kaktushose.jda.commands.dispatching.validation.Validator;
-import com.github.kaktushose.jda.commands.dispatching.validation.ValidatorRegistry;
+import com.github.kaktushose.jda.commands.dispatching.validation.internal.Validators;
 import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.Role;
 import net.dv8tion.jda.api.entities.User;
@@ -52,6 +52,17 @@ public record OptionDataDefinition(
         @NotNull Collection<ConstraintDefinition> constraints
 ) implements Definition, JDAEntity<OptionData> {
 
+    private static final Map<Class<?>, Class<?>> PRIMITIVE_MAPPING = Map.of(
+            int.class, Integer.class,
+            double.class, Double.class,
+            byte.class, Byte.class,
+            float.class, Float.class,
+            boolean.class, Boolean.class,
+            short.class, Short.class,
+            long.class, Long.class,
+            char.class, Character.class
+    );
+
     private static final Map<Class<?>, OptionType> OPTION_TYPE_MAPPINGS = Map.ofEntries(
             entry(Byte.class, OptionType.STRING),
             entry(Short.class, OptionType.STRING),
@@ -93,12 +104,12 @@ public record OptionDataDefinition(
     ///
     /// @param parameter         the [ParameterDescription] to build the [OptionDataDefinition] from
     /// @param autoComplete      whether the [ParameterDescription] should support autocomplete
-    /// @param validatorRegistry the corresponding [ValidatorRegistry]
+    /// @param validatorRegistry the corresponding [Validators]
     /// @return the [OptionDataDefinition]
     @NotNull
-    public static OptionDataDefinition build(ParameterDescription parameter,
+    public static OptionDataDefinition build(@NotNull ParameterDescription parameter,
                                              boolean autoComplete,
-                                             @NotNull ValidatorRegistry validatorRegistry) {
+                                             @NotNull Validators validatorRegistry) {
         var optional = parameter.annotation(com.github.kaktushose.jda.commands.annotations.interactions.Optional.class);
         var defaultValue = "";
         if (optional.isPresent()) {
@@ -113,8 +124,9 @@ public static OptionDataDefinition build(ParameterDescription parameter,
         parameter.annotations().stream()
                 .filter(it -> it.annotationType().isAnnotationPresent(Constraint.class))
                 .forEach(it -> {
-                    var validator = validatorRegistry.get(it.annotationType(), parameter.type());
-                    validator.ifPresent(value -> constraints.add(ConstraintDefinition.build(value, it)));
+                    var validator = validatorRegistry.get(it.annotationType(), PRIMITIVE_MAPPING.getOrDefault(parameter.type(), parameter.type()))
+                                    .orElseThrow(() -> new IllegalStateException("No validator found for %s on %s".formatted(it, parameter)));
+                    constraints.add(ConstraintDefinition.build(validator, it));
                 });
 
         // Param
diff --git a/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/SlashCommandDefinition.java b/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/SlashCommandDefinition.java
index ace1c8c40..670e949fc 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/SlashCommandDefinition.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/SlashCommandDefinition.java
@@ -81,7 +81,7 @@ public static Optional<SlashCommandDefinition> build(MethodBuildContext context)
         // build option data definitions
         List<OptionDataDefinition> commandOptions = method.parameters().stream()
                 .filter(it -> !(CommandEvent.class.isAssignableFrom(it.type())))
-                .map(parameter -> OptionDataDefinition.build(parameter, autoComplete, context.validatorRegistry()))
+                .map(parameter -> OptionDataDefinition.build(parameter, autoComplete, context.validators()))
                 .toList();
 
         Set<Permission> enabledFor = Set.of(command.enabledFor());
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/ImplementationRegistry.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/ImplementationRegistry.java
deleted file mode 100644
index b929b6096..000000000
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/ImplementationRegistry.java
+++ /dev/null
@@ -1,276 +0,0 @@
-package com.github.kaktushose.jda.commands.dispatching;
-
-import com.github.kaktushose.jda.commands.annotations.Implementation;
-import com.github.kaktushose.jda.commands.annotations.Inject;
-import com.github.kaktushose.jda.commands.annotations.constraints.Constraint;
-import com.github.kaktushose.jda.commands.dependency.DependencyInjector;
-import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapter;
-import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapterRegistry;
-import com.github.kaktushose.jda.commands.dispatching.middleware.Middleware;
-import com.github.kaktushose.jda.commands.dispatching.middleware.MiddlewareRegistry;
-import com.github.kaktushose.jda.commands.dispatching.middleware.Priority;
-import com.github.kaktushose.jda.commands.dispatching.validation.Validator;
-import com.github.kaktushose.jda.commands.dispatching.validation.ValidatorRegistry;
-import com.github.kaktushose.jda.commands.embeds.error.DefaultErrorMessageFactory;
-import com.github.kaktushose.jda.commands.embeds.error.ErrorMessageFactory;
-import com.github.kaktushose.jda.commands.permissions.DefaultPermissionsProvider;
-import com.github.kaktushose.jda.commands.permissions.PermissionsProvider;
-import com.github.kaktushose.jda.commands.scope.DefaultGuildScopeProvider;
-import com.github.kaktushose.jda.commands.scope.GuildScopeProvider;
-import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.NotNull;
-import org.reflections.Reflections;
-import org.reflections.scanners.Scanners;
-import org.reflections.util.ClasspathHelper;
-import org.reflections.util.ConfigurationBuilder;
-import org.reflections.util.FilterBuilder;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.ParameterizedType;
-import java.util.*;
-
-/// Central registry for all custom user implementations. This class will look for custom implementations that
-/// override the default implementation of this framework. Supports the following interfaces:
-///
-///   - [PermissionsProvider]
-///   - [ErrorMessageFactory]
-///   - [GuildScopeProvider]
-///   - [TypeAdapter]
-///   - [Middleware]
-///   - [Validator]
-///
-/// @see Implementation
-@ApiStatus.Internal
-public class ImplementationRegistry {
-
-    private static final Logger log = LoggerFactory.getLogger(ImplementationRegistry.class);
-    private static Reflections reflections;
-    private final DependencyInjector dependencyInjector;
-    private final MiddlewareRegistry middlewareRegistry;
-    private final TypeAdapterRegistry typeAdapterRegistry;
-    private final ValidatorRegistry validatorRegistry;
-    private PermissionsProvider permissionsProvider;
-    private ErrorMessageFactory errorMessageFactory;
-    private GuildScopeProvider guildScopeProvider;
-
-    /// Constructs a new ImplementationRegistry.
-    ///
-    /// @param dependencyInjector  the corresponding [DependencyInjector]
-    /// @param middlewareRegistry  the corresponding [MiddlewareRegistry]
-    /// @param typeAdapterRegistry the corresponding [TypeAdapterRegistry]
-    /// @param validatorRegistry   the corresponding [ValidatorRegistry]
-    public ImplementationRegistry(DependencyInjector dependencyInjector,
-                                  MiddlewareRegistry middlewareRegistry,
-                                  TypeAdapterRegistry typeAdapterRegistry,
-                                  ValidatorRegistry validatorRegistry) {
-        permissionsProvider = new DefaultPermissionsProvider();
-        errorMessageFactory = new DefaultErrorMessageFactory();
-        guildScopeProvider = new DefaultGuildScopeProvider();
-
-        this.dependencyInjector = dependencyInjector;
-        this.middlewareRegistry = middlewareRegistry;
-        this.typeAdapterRegistry = typeAdapterRegistry;
-        this.validatorRegistry = validatorRegistry;
-    }
-
-    /// Scans the whole classpath for custom implementations.
-    ///
-    /// @param packages package(s) to exclusively scan
-    /// @param clazz    a class of the classpath to scan
-    public void index(@NotNull Class<?> clazz, @NotNull String... packages) {
-        log.debug("Indexing custom implementations...");
-
-        FilterBuilder filter = new FilterBuilder();
-        for (String pkg : packages) {
-            filter.includePackage(pkg);
-        }
-
-        ConfigurationBuilder config = new ConfigurationBuilder()
-                .setScanners(Scanners.SubTypes)
-                .setUrls(ClasspathHelper.forClass(clazz))
-                .filterInputsBy(filter);
-        reflections = new Reflections(config);
-
-        findImplementation(PermissionsProvider.class).ifPresent(this::setPermissionsProvider);
-        findImplementation(ErrorMessageFactory.class).ifPresent(this::setErrorMessageFactory);
-        findImplementation(GuildScopeProvider.class).ifPresent(this::setGuildScopeProvider);
-
-        findMiddlewares().forEach(middlewareRegistry::register);
-        findAdapters().forEach(typeAdapterRegistry::register);
-        findValidators().forEach(validatorRegistry::register);
-    }
-
-    /// Gets the [PermissionsProvider].
-    ///
-    /// @return the [PermissionsProvider]
-    public PermissionsProvider getPermissionsProvider() {
-        return permissionsProvider;
-    }
-
-    /// Sets the [PermissionsProvider].
-    ///
-    /// @param permissionsProvider the new [PermissionsProvider]
-    public void setPermissionsProvider(PermissionsProvider permissionsProvider) {
-        this.permissionsProvider = permissionsProvider;
-    }
-
-    /// Gets the [ErrorMessageFactory].
-    ///
-    /// @return the [ErrorMessageFactory]
-    public ErrorMessageFactory getErrorMessageFactory() {
-        return errorMessageFactory;
-    }
-
-    /// Sets the [ErrorMessageFactory]
-    ///
-    /// @param errorMessageFactory the new [ErrorMessageFactory]
-    public void setErrorMessageFactory(ErrorMessageFactory errorMessageFactory) {
-        this.errorMessageFactory = errorMessageFactory;
-    }
-
-    /// Gets the [GuildScopeProvider].
-    ///
-    /// @return the [GuildScopeProvider]
-    public GuildScopeProvider getGuildScopeProvider() {
-        return guildScopeProvider;
-    }
-
-
-    /// Sets the [GuildScopeProvider]
-    ///
-    /// @param guildScopeProvider the new [GuildScopeProvider]
-    public void setGuildScopeProvider(GuildScopeProvider guildScopeProvider) {
-        this.guildScopeProvider = guildScopeProvider;
-    }
-
-    @SuppressWarnings("unchecked")
-    private <T> Optional<T> findImplementation(Class<T> type) {
-        T instance = null;
-        for (Class<?> clazz : reflections.getSubTypesOf(type)) {
-            if (!clazz.isAnnotationPresent(Implementation.class)) {
-                continue;
-            }
-
-            log.debug("Found {}", clazz.getName());
-            try {
-                instance = (T) clazz.getConstructor().newInstance();
-            } catch (InstantiationException | IllegalAccessException | InvocationTargetException |
-                     NoSuchMethodException e) {
-                log.error("Unable to create an instance of the custom implementation!", e);
-                continue;
-            }
-
-            List<Field> fields = new ArrayList<>();
-            for (Field field : clazz.getDeclaredFields()) {
-                if (!field.isAnnotationPresent(Inject.class)) {
-                    continue;
-                }
-                fields.add(field);
-            }
-            dependencyInjector.registerDependencies(clazz, fields);
-            dependencyInjector.inject(instance);
-        }
-        return Optional.ofNullable(instance);
-    }
-
-    private Map<Priority, Collection<Middleware>> findMiddlewares() {
-        Map<Priority, Collection<Middleware>> result = new HashMap<>();
-        for (Class<? extends Middleware> clazz : reflections.getSubTypesOf(Middleware.class)) {
-            if (!clazz.isAnnotationPresent(Implementation.class)) {
-                continue;
-            }
-
-            log.debug("Found middleware {}", clazz.getName());
-
-            Middleware instance;
-            try {
-                instance = clazz.getConstructor().newInstance();
-            } catch (InstantiationException | IllegalAccessException | InvocationTargetException |
-                     NoSuchMethodException e) {
-                log.error("Unable to create an instance of the custom implementation!", e);
-                continue;
-            }
-
-            Priority priority = clazz.getAnnotation(Implementation.class).priority();
-
-            result.putIfAbsent(priority, new HashSet<>());
-            result.get(priority).add(instance);
-        }
-        return result;
-    }
-
-    @SuppressWarnings("rawtypes")
-    private Map<Class<?>, TypeAdapter<?>> findAdapters() {
-        Map<Class<?>, TypeAdapter<?>> result = new HashMap<>();
-        for (Class<? extends TypeAdapter> clazz : reflections.getSubTypesOf(TypeAdapter.class)) {
-            if (!clazz.isAnnotationPresent(Implementation.class)) {
-                continue;
-            }
-
-            log.debug("Found {}", clazz.getName());
-
-            Class<?> generic;
-            try {
-                generic = Class.forName(((ParameterizedType) clazz.getGenericInterfaces()[0]).getActualTypeArguments()[0].getTypeName());
-            } catch (ClassNotFoundException e) {
-                log.error("Unable to find class of type adapter!", e);
-                continue;
-            }
-
-            TypeAdapter<?> instance;
-            try {
-                instance = clazz.getConstructor().newInstance();
-            } catch (InstantiationException | IllegalAccessException | InvocationTargetException |
-                     NoSuchMethodException e) {
-                log.error("Unable to create an instance of the custom implementation!", e);
-                continue;
-            }
-
-            result.put(generic, instance);
-
-            List<Field> fields = new ArrayList<>();
-            for (Field field : clazz.getDeclaredFields()) {
-                if (!field.isAnnotationPresent(Inject.class)) {
-                    continue;
-                }
-                fields.add(field);
-            }
-            dependencyInjector.registerDependencies(clazz, fields);
-            dependencyInjector.inject(instance);
-        }
-        return result;
-    }
-
-    private Map<Class<? extends Annotation>, Validator> findValidators() {
-        Map<Class<? extends Annotation>, Validator> result = new HashMap<>();
-        for (Class<? extends Validator> clazz : reflections.getSubTypesOf(Validator.class)) {
-            if (!clazz.isAnnotationPresent(Implementation.class)) {
-                continue;
-            }
-
-            log.debug("Found {}", clazz.getName());
-
-            Validator instance;
-            try {
-                instance = clazz.getConstructor().newInstance();
-            } catch (InstantiationException | IllegalAccessException | InvocationTargetException |
-                     NoSuchMethodException e) {
-                log.error("Unable to create an instance of the custom implementation!", e);
-                continue;
-            }
-
-            Class<? extends Annotation> annotation = clazz.getAnnotation(Implementation.class).annotation();
-            if (Constraint.class.isAssignableFrom(annotation)) {
-                log.error("Invalid annotation type {}!", Constraint.class);
-                continue;
-            }
-
-            result.put(annotation, instance);
-        }
-        return result;
-    }
-}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/JDAEventListener.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/JDAEventListener.java
index b99ed8fcc..37248cd60 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/JDAEventListener.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/JDAEventListener.java
@@ -55,7 +55,7 @@ public void onGenericInteractionCreate(@NotNull GenericInteractionCreateEvent jd
                 componentEvent.deferEdit().setComponents().queue();
                 componentEvent.getHook()
                         .setEphemeral(true)
-                        .sendMessage(context.implementationRegistry().getErrorMessageFactory().getTimedOutComponentMessage(jdaEvent))
+                        .sendMessage(context.errorMessageFactory().getTimedOutComponentMessage(jdaEvent))
                         .queue();
             } else {
                 log.debug("Received unknown event: {}", jdaEvent);
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/Runtime.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/Runtime.java
index 88dc6e966..fcd945d20 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/Runtime.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/Runtime.java
@@ -1,6 +1,7 @@
 package com.github.kaktushose.jda.commands.dispatching;
 
 import com.github.kaktushose.jda.commands.definitions.interactions.InteractionDefinition;
+import com.github.kaktushose.jda.commands.dependency.DependencyInjector;
 import com.github.kaktushose.jda.commands.dispatching.context.KeyValueStore;
 import com.github.kaktushose.jda.commands.dispatching.expiration.ExpirationStrategy;
 import com.github.kaktushose.jda.commands.dispatching.handling.*;
@@ -46,6 +47,7 @@ public final class Runtime implements Closeable {
     private final AutoCompleteHandler autoCompleteHandler;
     private final ContextCommandHandler contextCommandHandler;
     private final ComponentHandler componentHandler;
+    private final DependencyInjector dependencyInjector;
     private final String id;
     private final Map<Class<?>, Object> instances;
     private final BlockingQueue<GenericInteractionCreateEvent> blockingQueue;
@@ -64,6 +66,7 @@ private Runtime(@NotNull String id, @NotNull DispatchingContext dispatchingConte
         contextCommandHandler = new ContextCommandHandler(dispatchingContext);
         componentHandler = new ComponentHandler(dispatchingContext);
         modalHandler = new ModalHandler(dispatchingContext);
+        this.dependencyInjector = dispatchingContext.dependencyInjector();
         this.executionThread = Thread.ofVirtual()
                 .name("JDAC Runtime-Thread %s".formatted(id))
                 .uncaughtExceptionHandler((_, e) -> log.error("Error in JDA-Commands Runtime:", e))
@@ -123,7 +126,9 @@ public KeyValueStore keyValueStore() {
     public Object instance(InteractionDefinition definition) {
         return instances.computeIfAbsent(definition.methodDescription().declaringClass(), _ -> {
             try {
-                return definition.newInstance();
+                var instance =  definition.newInstance();
+                dependencyInjector.inject(instance);
+                return instance;
             } catch (InvocationTargetException | InstantiationException | IllegalAccessException e) {
                 throw new RuntimeException(e);
             }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/TypeAdapterRegistry.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/TypeAdapterRegistry.java
deleted file mode 100644
index 9f181c0f8..000000000
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/TypeAdapterRegistry.java
+++ /dev/null
@@ -1,111 +0,0 @@
-package com.github.kaktushose.jda.commands.dispatching.adapter;
-
-import com.github.kaktushose.jda.commands.dispatching.adapter.impl.*;
-import net.dv8tion.jda.api.entities.Member;
-import net.dv8tion.jda.api.entities.Role;
-import net.dv8tion.jda.api.entities.User;
-import net.dv8tion.jda.api.entities.channel.concrete.*;
-import net.dv8tion.jda.api.entities.channel.middleman.AudioChannel;
-import net.dv8tion.jda.api.entities.channel.middleman.GuildChannel;
-import net.dv8tion.jda.api.entities.channel.middleman.GuildMessageChannel;
-import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Optional;
-
-/// Central registry for all type adapters.
-///
-/// @see TypeAdapter
-public class TypeAdapterRegistry {
-
-    public static final Map<Class<?>, Object> DEFAULT_MAPPINGS = Map.of(
-            byte.class, ((byte) 0),
-            short.class, ((short) 0),
-            int.class, 0,
-            long.class, 0L,
-            double.class, 0.0d,
-            float.class, 0.0f,
-            boolean.class, false,
-            char.class, '\u0000'
-    );
-    private static final Logger log = LoggerFactory.getLogger(TypeAdapterRegistry.class);
-    private final Map<Class<?>, TypeAdapter<?>> parameterAdapters;
-
-    /// Constructs a new TypeAdapterRegistry. This will register default type adapters for:
-    ///
-    ///   - all primitive data types
-    ///   - [String]
-    ///   - [String] Array
-    ///   - [Member]
-    ///   - [User]
-    ///   - [MessageChannel] and subtypes
-    ///   - [Role]
-    public TypeAdapterRegistry() {
-        parameterAdapters = new HashMap<>();
-
-        // default types
-        register(Byte.class, new ByteAdapter());
-        register(Short.class, new ShortAdapter());
-        register(Integer.class, new IntegerAdapter());
-        register(Long.class, new LongAdapter());
-        register(Float.class, new FloatAdapter());
-        register(Double.class, new DoubleAdapter());
-        register(Character.class, new CharacterAdapter());
-        register(Boolean.class, new BooleanAdapter());
-        register(String.class, (TypeAdapter<String>) (raw, _) -> Optional.of(raw));
-        register(String[].class, (TypeAdapter<String>) (raw, _) -> Optional.of(raw));
-
-        // jda specific
-        register(Member.class, new MemberAdapter());
-        register(User.class, new UserAdapter());
-        register(GuildChannel.class, new GuildChannelAdapter());
-        register(GuildMessageChannel.class, new GuildMessageChannelAdapter());
-        register(ThreadChannel.class, new ThreadChannelAdapter());
-        register(TextChannel.class, new TextChannelAdapter());
-        register(NewsChannel.class, new NewsChannelAdapter());
-        register(AudioChannel.class, new AudioChannelAdapter());
-        register(VoiceChannel.class, new VoiceChannelAdapter());
-        register(StageChannel.class, new StageChannelAdapter());
-        register(Role.class, new RoleAdapter());
-    }
-
-    /// Registers a new type adapter.
-    ///
-    /// @param type    the type the adapter is for
-    /// @param adapter the [TypeAdapter]
-    public void register(@NotNull Class<?> type, @NotNull TypeAdapter<?> adapter) {
-        parameterAdapters.put(type, adapter);
-        log.debug("Registered adapter {} for type {}", adapter.getClass().getName(), type.getName());
-    }
-
-    /// Unregisters a new type adapter.
-    ///
-    /// @param type the type the adapter is for
-    public void unregister(@NotNull Class<?> type) {
-        parameterAdapters.remove(type);
-        log.debug("Unregistered adapter for type {}", type.getName());
-    }
-
-    /// Checks if a type adapter for the given type exists.
-    ///
-    /// @param type the type to check
-    /// @return `true` if a type adapter exists
-    public boolean exists(@Nullable Class<?> type) {
-        return parameterAdapters.containsKey(type);
-    }
-
-    /// Retrieves a type adapter.
-    ///
-    /// @param type the type to get the adapter for
-    /// @return the type adapter or an empty Optional if none found
-    public Optional<TypeAdapter<?>> get(@Nullable Class<?> type) {
-        return Optional.ofNullable(parameterAdapters.get(type));
-    }
-
-
-}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/internal/TypeAdapters.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/internal/TypeAdapters.java
new file mode 100644
index 000000000..09a3adf8a
--- /dev/null
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/internal/TypeAdapters.java
@@ -0,0 +1,95 @@
+package com.github.kaktushose.jda.commands.dispatching.adapter.internal;
+
+import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapter;
+import com.github.kaktushose.jda.commands.dispatching.adapter.impl.*;
+import net.dv8tion.jda.api.entities.Member;
+import net.dv8tion.jda.api.entities.Role;
+import net.dv8tion.jda.api.entities.User;
+import net.dv8tion.jda.api.entities.channel.concrete.*;
+import net.dv8tion.jda.api.entities.channel.middleman.AudioChannel;
+import net.dv8tion.jda.api.entities.channel.middleman.GuildChannel;
+import net.dv8tion.jda.api.entities.channel.middleman.GuildMessageChannel;
+import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+
+/// Central registry for all type adapters.
+///
+/// @see TypeAdapter
+public class TypeAdapters {
+
+    public static final Map<Class<?>, Object> DEFAULT_MAPPINGS = Map.of(
+            byte.class, ((byte) 0),
+            short.class, ((short) 0),
+            int.class, 0,
+            long.class, 0L,
+            double.class, 0.0d,
+            float.class, 0.0f,
+            boolean.class, false,
+            char.class, '\u0000'
+    );
+    private final Map<Class<?>, TypeAdapter<?>> parameterAdapters;
+
+    /// Constructs a new TypeAdapters. This will register default type adapters for:
+    ///
+    ///   - all primitive data types
+    ///   - [String]
+    ///   - [String] Array
+    ///   - [Member]
+    ///   - [User]
+    ///   - [MessageChannel] and subtypes
+    ///   - [Role]
+    public TypeAdapters(@NotNull Map<Class<?>, TypeAdapter<?>> parameterAdapters) {
+        HashMap<Class<?>, TypeAdapter<?>> adapterMap = new HashMap<>(parameterAdapters);
+
+        // default types
+        adapterMap.put(Byte.class, new ByteAdapter());
+        adapterMap.put(Short.class, new ShortAdapter());
+        adapterMap.put(Integer.class, new IntegerAdapter());
+        adapterMap.put(Long.class, new LongAdapter());
+        adapterMap.put(Float.class, new FloatAdapter());
+        adapterMap.put(Double.class, new DoubleAdapter());
+        adapterMap.put(Character.class, new CharacterAdapter());
+        adapterMap.put(Boolean.class, new BooleanAdapter());
+        adapterMap.put(String.class, (TypeAdapter<String>) (raw, _) -> Optional.of(raw));
+        adapterMap.put(String[].class, (TypeAdapter<String>) (raw, _) -> Optional.of(raw));
+
+        // jda specific
+        adapterMap.put(Member.class, new MemberAdapter());
+        adapterMap.put(User.class, new UserAdapter());
+        adapterMap.put(GuildChannel.class, new GuildChannelAdapter());
+        adapterMap.put(GuildMessageChannel.class, new GuildMessageChannelAdapter());
+        adapterMap.put(ThreadChannel.class, new ThreadChannelAdapter());
+        adapterMap.put(TextChannel.class, new TextChannelAdapter());
+        adapterMap.put(NewsChannel.class, new NewsChannelAdapter());
+        adapterMap.put(AudioChannel.class, new AudioChannelAdapter());
+        adapterMap.put(VoiceChannel.class, new VoiceChannelAdapter());
+        adapterMap.put(StageChannel.class, new StageChannelAdapter());
+        adapterMap.put(Role.class, new RoleAdapter());
+
+        this.parameterAdapters = Collections.unmodifiableMap(adapterMap);
+    }
+
+    /// Checks if a type adapter for the given type exists.
+    ///
+    /// @param type the type to check
+    /// @return `true` if a type adapter exists
+    public boolean exists(@Nullable Class<?> type) {
+        return parameterAdapters.containsKey(type);
+    }
+
+    /// Retrieves a type adapter.
+    ///
+    /// @param type the type to get the adapter for
+    /// @return the type adapter or an empty Optional if none found
+    public Optional<TypeAdapter<?>> get(@Nullable Class<?> type) {
+        return Optional.ofNullable(parameterAdapters.get(type));
+    }
+
+
+}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/context/package-info.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/context/package-info.java
deleted file mode 100644
index b4cc1ac0c..000000000
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/context/package-info.java
+++ /dev/null
@@ -1,2 +0,0 @@
-/// Context objects that are bound to every event handling.
-package com.github.kaktushose.jda.commands.dispatching.context;
\ No newline at end of file
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/ModalReplyableEvent.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/ModalReplyableEvent.java
index 8efd9e0cd..b7f04ec93 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/ModalReplyableEvent.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/ModalReplyableEvent.java
@@ -35,8 +35,10 @@ public abstract sealed class ModalReplyableEvent<T extends GenericInteractionCre
     protected ModalReplyableEvent(@NotNull T event,
                                   @NotNull InteractionRegistry registry,
                                   @NotNull Runtime runtime,
-                                  @NotNull InteractionDefinition definition) {
-        super(event, registry, runtime, definition);
+                                  @NotNull InteractionDefinition definition,
+                                  @NotNull InteractionDefinition.ReplyConfig global
+                                  ) {
+        super(event, registry, runtime, definition, global);
     }
 
     /// Acknowledgement of this event with a [Modal]. This will open a popup on the target user's Discord client.
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/ReplyableEvent.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/ReplyableEvent.java
index aa7d0a419..c4817cde3 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/ReplyableEvent.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/ReplyableEvent.java
@@ -56,9 +56,10 @@ public sealed abstract class ReplyableEvent<T extends GenericInteractionCreateEv
     protected ReplyableEvent(T event,
                              InteractionRegistry interactionRegistry,
                              Runtime runtime,
-                             InteractionDefinition definition) {
+                             InteractionDefinition definition,
+                             InteractionDefinition.ReplyConfig globalReplyConfig) {
         super(event, interactionRegistry, runtime);
-        this.replyConfig = definition.replyConfig();
+        this.replyConfig = definition.replyConfig(globalReplyConfig);
         this.definition = definition;
     }
 
@@ -132,6 +133,6 @@ public Message reply(@NotNull EmbedBuilder builder) {
 
     private MessageReply newReply() {
         log.debug("Reply Debug: [Runtime={}]", runtimeId());
-        return new MessageReply(event, definition);
+        return new MessageReply(event, definition, replyConfig);
     }
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/interactions/CommandEvent.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/interactions/CommandEvent.java
index 4ad709e5e..3a6fc4981 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/interactions/CommandEvent.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/interactions/CommandEvent.java
@@ -24,8 +24,9 @@ public final class CommandEvent extends ModalReplyableEvent<GenericCommandIntera
     public CommandEvent(@NotNull GenericCommandInteractionEvent event,
                         @NotNull InteractionRegistry registry,
                         @NotNull Runtime runtime,
-                        @NotNull InteractionDefinition definition) {
-        super(event, registry, runtime, definition);
+                        @NotNull InteractionDefinition definition,
+                        @NotNull InteractionDefinition.ReplyConfig global) {
+        super(event, registry, runtime, definition, global);
     }
 
     /// Returns the underlying [GenericCommandInteractionEvent] and casts it to the given type.
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/interactions/ComponentEvent.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/interactions/ComponentEvent.java
index 54a95854e..b29c572ad 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/interactions/ComponentEvent.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/interactions/ComponentEvent.java
@@ -26,8 +26,9 @@ public final class ComponentEvent extends ModalReplyableEvent<GenericComponentIn
     public ComponentEvent(@NotNull GenericComponentInteractionCreateEvent event,
                           @NotNull InteractionRegistry registry,
                           @NotNull Runtime runtime,
-                          @NotNull InteractionDefinition definition) {
-        super(event, registry, runtime, definition);
+                          @NotNull InteractionDefinition definition,
+                          @NotNull InteractionDefinition.ReplyConfig global) {
+        super(event, registry, runtime, definition, global);
     }
 
     /// Returns the underlying [GenericComponentInteractionCreateEvent] and casts it to the given type.
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/interactions/ModalEvent.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/interactions/ModalEvent.java
index 1401293b4..4ef6b0ad7 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/interactions/ModalEvent.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/interactions/ModalEvent.java
@@ -24,8 +24,9 @@ public final class ModalEvent extends ReplyableEvent<ModalInteractionEvent> {
     public ModalEvent(@NotNull ModalInteractionEvent event,
                       @NotNull InteractionRegistry registry,
                       @NotNull Runtime runtime,
-                      @NotNull InteractionDefinition definition) {
-        super(event, registry, runtime, definition);
+                      @NotNull InteractionDefinition definition,
+                      @NotNull InteractionDefinition.ReplyConfig global) {
+        super(event, registry, runtime, definition, global);
     }
 
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/ComponentHandler.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/ComponentHandler.java
index c4d6854fb..c6ecb8d65 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/ComponentHandler.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/ComponentHandler.java
@@ -40,7 +40,7 @@ protected InvocationContext<GenericComponentInteractionCreateEvent> prepare(@Not
             default ->
                     throw new IllegalStateException("Should not occur. Please report this error the the devs of jda-commands.");
         };
-        arguments.addFirst(new ComponentEvent(genericEvent, registry, runtime, component));
+        arguments.addFirst(new ComponentEvent(genericEvent, registry, runtime, component, dispatchingContext.globalReplyConfig()));
 
         return new InvocationContext<>(
                 genericEvent,
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/DispatchingContext.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/DispatchingContext.java
index 74112bf20..72ac2cd97 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/DispatchingContext.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/DispatchingContext.java
@@ -1,17 +1,21 @@
 package com.github.kaktushose.jda.commands.dispatching.handling;
 
+import com.github.kaktushose.jda.commands.definitions.interactions.InteractionDefinition;
 import com.github.kaktushose.jda.commands.definitions.interactions.InteractionRegistry;
-import com.github.kaktushose.jda.commands.dispatching.ImplementationRegistry;
-import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapterRegistry;
+import com.github.kaktushose.jda.commands.dependency.DependencyInjector;
+import com.github.kaktushose.jda.commands.dispatching.adapter.internal.TypeAdapters;
 import com.github.kaktushose.jda.commands.dispatching.expiration.ExpirationStrategy;
-import com.github.kaktushose.jda.commands.dispatching.middleware.MiddlewareRegistry;
+import com.github.kaktushose.jda.commands.dispatching.middleware.internal.Middlewares;
+import com.github.kaktushose.jda.commands.embeds.error.ErrorMessageFactory;
 import org.jetbrains.annotations.ApiStatus;
 
 /// A collection of classes relevant for [EventHandler]s.
 @ApiStatus.Internal
-public record DispatchingContext(MiddlewareRegistry middlewareRegistry,
-                                 ImplementationRegistry implementationRegistry,
+public record DispatchingContext(Middlewares middlewares,
+                                 ErrorMessageFactory errorMessageFactory,
                                  InteractionRegistry registry,
-                                 TypeAdapterRegistry adapterRegistry,
-                                 ExpirationStrategy expirationStrategy) {
+                                 TypeAdapters adapterRegistry,
+                                 ExpirationStrategy expirationStrategy,
+                                 DependencyInjector dependencyInjector,
+                                 InteractionDefinition.ReplyConfig globalReplyConfig) {
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/EventHandler.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/EventHandler.java
index bf6c683b5..635cb1649 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/EventHandler.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/EventHandler.java
@@ -2,15 +2,15 @@
 
 import com.github.kaktushose.jda.commands.definitions.interactions.InteractionDefinition;
 import com.github.kaktushose.jda.commands.definitions.interactions.InteractionRegistry;
-import com.github.kaktushose.jda.commands.dispatching.ImplementationRegistry;
 import com.github.kaktushose.jda.commands.dispatching.Runtime;
-import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapterRegistry;
+import com.github.kaktushose.jda.commands.dispatching.adapter.internal.TypeAdapters;
 import com.github.kaktushose.jda.commands.dispatching.context.InvocationContext;
 import com.github.kaktushose.jda.commands.dispatching.handling.command.ContextCommandHandler;
 import com.github.kaktushose.jda.commands.dispatching.handling.command.SlashCommandHandler;
 import com.github.kaktushose.jda.commands.dispatching.middleware.Middleware;
-import com.github.kaktushose.jda.commands.dispatching.middleware.MiddlewareRegistry;
+import com.github.kaktushose.jda.commands.dispatching.middleware.internal.Middlewares;
 import com.github.kaktushose.jda.commands.dispatching.middleware.Priority;
+import com.github.kaktushose.jda.commands.embeds.error.ErrorMessageFactory;
 import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent;
 import net.dv8tion.jda.api.interactions.callbacks.IReplyCallback;
 import org.jetbrains.annotations.ApiStatus;
@@ -45,17 +45,17 @@ public abstract sealed class EventHandler<T extends GenericInteractionCreateEven
     public static final Logger log = LoggerFactory.getLogger(EventHandler.class);
 
     protected final DispatchingContext dispatchingContext;
-    protected final MiddlewareRegistry middlewareRegistry;
-    protected final ImplementationRegistry implementationRegistry;
+    protected final Middlewares middlewares;
     protected final InteractionRegistry registry;
-    protected final TypeAdapterRegistry adapterRegistry;
+    protected final TypeAdapters adapterRegistry;
+    protected final ErrorMessageFactory errorMessageFactory;
 
     public EventHandler(DispatchingContext dispatchingContext) {
         this.dispatchingContext = dispatchingContext;
-        this.middlewareRegistry = dispatchingContext.middlewareRegistry();
-        this.implementationRegistry = dispatchingContext.implementationRegistry();
+        this.middlewares = dispatchingContext.middlewares();
         this.registry = dispatchingContext.registry();
         this.adapterRegistry = dispatchingContext.adapterRegistry();
+        this.errorMessageFactory = dispatchingContext.errorMessageFactory();
     }
 
     @Nullable
@@ -73,7 +73,7 @@ public final void accept(T e, Runtime runtime) {
         }
 
         log.debug("Executing middlewares...");
-        middlewareRegistry.forAllOrdered(middleware -> {
+        middlewares.forAllOrdered(middleware -> {
             log.debug("Executing middleware {}", middleware.getClass().getSimpleName());
             middleware.accept(context);
         });
@@ -109,7 +109,7 @@ private void invoke(@NotNull InvocationContext<T> invocation, @NotNull Runtime r
             if (invocation.event() instanceof IReplyCallback callback) {
                 callback.getHook().editOriginalComponents().queue();
             }
-            invocation.cancel(implementationRegistry.getErrorMessageFactory().getCommandExecutionFailedMessage(invocation, throwable));
+            invocation.cancel(errorMessageFactory.getCommandExecutionFailedMessage(invocation, throwable));
         }
     }
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/ModalHandler.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/ModalHandler.java
index c0f723773..15e5f6be9 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/ModalHandler.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/ModalHandler.java
@@ -31,7 +31,7 @@ protected InvocationContext<ModalInteractionEvent> prepare(@NotNull ModalInterac
         );
 
         List<Object> arguments = event.getValues().stream().map(ModalMapping::getAsString).collect(Collectors.toList());
-        arguments.addFirst(new ModalEvent(event, registry, runtime, modal));
+        arguments.addFirst(new ModalEvent(event, registry, runtime, modal, dispatchingContext.globalReplyConfig()));
 
         return new InvocationContext<>(
                 event,
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/command/ContextCommandHandler.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/command/ContextCommandHandler.java
index bf7e7c741..fbe2cdd84 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/command/ContextCommandHandler.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/command/ContextCommandHandler.java
@@ -27,7 +27,7 @@ protected InvocationContext<GenericContextInteractionEvent<?>> prepare(@NotNull
         );
 
         return new InvocationContext<>(event, runtime.keyValueStore(), command,
-                List.of(new CommandEvent(event, registry, runtime, command), event.getTarget())
+                List.of(new CommandEvent(event, registry, runtime, command, dispatchingContext.globalReplyConfig()), event.getTarget())
         );
     }
 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/command/SlashCommandHandler.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/command/SlashCommandHandler.java
index 53f1b84a7..67267a68f 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/command/SlashCommandHandler.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/command/SlashCommandHandler.java
@@ -2,13 +2,12 @@
 
 import com.github.kaktushose.jda.commands.definitions.interactions.command.SlashCommandDefinition;
 import com.github.kaktushose.jda.commands.dispatching.Runtime;
-import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapterRegistry;
+import com.github.kaktushose.jda.commands.dispatching.adapter.internal.TypeAdapters;
 import com.github.kaktushose.jda.commands.dispatching.context.InvocationContext;
 import com.github.kaktushose.jda.commands.dispatching.events.interactions.CommandEvent;
 import com.github.kaktushose.jda.commands.dispatching.handling.DispatchingContext;
 import com.github.kaktushose.jda.commands.dispatching.handling.EventHandler;
 import com.github.kaktushose.jda.commands.dispatching.reply.MessageReply;
-import com.github.kaktushose.jda.commands.embeds.error.ErrorMessageFactory;
 import com.github.kaktushose.jda.commands.internal.Helpers;
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
 import net.dv8tion.jda.api.interactions.commands.OptionMapping;
@@ -45,11 +44,10 @@ private Optional<List<Object>> parseArguments(SlashCommandDefinition command, Sl
                 .toList();
 
         List<Object> parsedArguments = new ArrayList<>();
-        ErrorMessageFactory messageFactory = implementationRegistry.getErrorMessageFactory();
 
         log.debug("Type adapting arguments...");
         var commandOptions = List.copyOf(command.commandOptions());
-        parsedArguments.addFirst(new CommandEvent(event, registry, runtime, command));
+        parsedArguments.addFirst(new CommandEvent(event, registry, runtime, command, dispatchingContext.globalReplyConfig()));
 
         if (input.size() != commandOptions.size()) {
             throw new IllegalStateException(
@@ -62,8 +60,7 @@ private Optional<List<Object>> parseArguments(SlashCommandDefinition command, Sl
             var raw = input.get(i);
             if (raw == null) {
                 if (commandOption.defaultValue() == null) {
-                    System.out.println(commandOption.type());
-                    parsedArguments.add(TypeAdapterRegistry.DEFAULT_MAPPINGS.getOrDefault(commandOption.type(), null));
+                    parsedArguments.add(TypeAdapters.DEFAULT_MAPPINGS.getOrDefault(commandOption.type(), null));
                     continue;
                 } else {
                     raw = commandOption.defaultValue();
@@ -81,8 +78,8 @@ private Optional<List<Object>> parseArguments(SlashCommandDefinition command, Sl
             var parsed = adapter.apply(raw, event);
             if (parsed.isEmpty()) {
                 log.debug("Type adapting failed!");
-                new MessageReply(event, command).reply(
-                        messageFactory.getTypeAdaptingFailedMessage(Helpers.errorContext(event, command), input)
+                new MessageReply(event, command, dispatchingContext.globalReplyConfig()).reply(
+                        errorMessageFactory.getTypeAdaptingFailedMessage(Helpers.errorContext(event, command), input)
                 );
                 return Optional.empty();
             }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/Middleware.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/Middleware.java
index 9721bea98..47d1629ee 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/Middleware.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/Middleware.java
@@ -2,16 +2,17 @@
 
 import com.github.kaktushose.jda.commands.annotations.Implementation;
 import com.github.kaktushose.jda.commands.dispatching.context.InvocationContext;
+import com.github.kaktushose.jda.commands.dispatching.middleware.internal.Middlewares;
 import net.dv8tion.jda.api.utils.messages.MessageCreateData;
 
 import java.util.function.Consumer;
 
 /// Middlewares run just before an interaction event gets dispatched. They are used to perform additional checks or add
-/// more info the [InvocationContext]. Either register them at the [MiddlewareRegistry] or use the [Implementation]
+/// more info the [InvocationContext]. Either register them at the [Middlewares] or use the [Implementation]
 /// annotation. Middlewares can have different [Priorities][Priority] dictating their priority on execution.
 ///
 /// @see Implementation Implementation
-/// @see MiddlewareRegistry
+/// @see Middlewares
 @FunctionalInterface
 public interface Middleware extends Consumer<InvocationContext<?>> {
 
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/MiddlewareRegistry.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/MiddlewareRegistry.java
deleted file mode 100644
index 8334e1bdb..000000000
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/MiddlewareRegistry.java
+++ /dev/null
@@ -1,89 +0,0 @@
-package com.github.kaktushose.jda.commands.dispatching.middleware;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.*;
-import java.util.function.Consumer;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-/// Central registry for all [Middleware]s.
-public class MiddlewareRegistry {
-
-    private static final Logger log = LoggerFactory.getLogger(MiddlewareRegistry.class);
-    private final SortedMap<Priority, Set<Middleware>> middlewares = new TreeMap<>(Map.of(
-            Priority.PERMISSIONS, new HashSet<>(),
-            Priority.HIGH, new HashSet<>(),
-            Priority.NORMAL, new HashSet<>(),
-            Priority.LOW, new HashSet<>()
-    ));
-
-    /// Register [Middleware(s)][Middleware] with the given [Priority].
-    ///
-    /// @param priority    the [Priority] to register the [Middleware(s)][Middleware] with
-    /// @param first       the first [Middleware] to register
-    /// @param middlewares additional [Middleware]s to register
-    /// @return this instance for fluent interface
-    public MiddlewareRegistry register(Priority priority, Middleware first, Middleware... middlewares) {
-        register(priority, Stream.concat(Stream.of(first), Arrays.stream(middlewares)).collect(Collectors.toList()));
-        return this;
-    }
-
-    /// Register [Middleware(s)][Middleware] with the given [Priority].
-    ///
-    /// @param priority    the [Priority] to register the [Middleware(s)][Middleware] with
-    /// @param middlewares the [Middleware(s)][Middleware] to register
-    /// @return this instance for fluent interface
-    public MiddlewareRegistry register(Priority priority, Collection<Middleware> middlewares) {
-        this.middlewares.get(priority).addAll(middlewares);
-        log.debug("Registered middleware(s) {} with priority {}", middlewares, priority);
-        return this;
-    }
-
-    /// Unregister [Middleware(s)][Middleware] with the given [Priority].
-    ///
-    /// @param priority    the [Priority] to unregister the [Middleware(s)][Middleware] with
-    /// @param first       the first [Middleware] to unregister
-    /// @param middlewares additional [Middlewares][Middleware] to unregister
-    /// @return this instance for fluent interface
-    public MiddlewareRegistry unregister(Priority priority, Middleware first, Middleware... middlewares) {
-        unregister(priority, Stream.concat(Stream.of(first), Arrays.stream(middlewares)).collect(Collectors.toList()));
-        return this;
-    }
-
-    /// Unregister [Middleware(s)][Middleware] with the given [Priority].
-    ///
-    /// @param priority    the [Priority] to unregister the [Middleware(s)][Middleware] with
-    /// @param middlewares the [Middleware(s)][Middleware] to unregister
-    /// @return this instance for fluent interface
-    public MiddlewareRegistry unregister(Priority priority, Collection<Middleware> middlewares) {
-        this.middlewares.get(priority).removeAll(middlewares);
-        log.debug("Unregistered middleware(s) {}", middlewares);
-        return this;
-    }
-
-    /// Returns a set of all registered [Middlewares][Middleware], regardless of their priority.
-    ///
-    /// @return a set of all registered middlewares [Middlewares][Middleware]
-    public Set<Middleware> getMiddlewares() {
-        return middlewares.sequencedValues()
-                .stream()
-                .flatMap(Collection::stream)
-                .collect(Collectors.toUnmodifiableSet());
-    }
-
-    public void forAllOrdered(Consumer<Middleware> task) {
-        for (Set<Middleware> value : middlewares.values()) {
-            value.forEach(task);
-        }
-    }
-
-    /// Returns a possibly-empty set of all registered [Middlewares][Middleware] with the given [Priority].
-    ///
-    /// @return a set of all registered middlewares [Middlewares][Middleware] with the given [Priority]
-    public Set<Middleware> getMiddlewares(Priority priority) {
-        return Collections.unmodifiableSet(middlewares.get(priority));
-    }
-
-}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/ConstraintMiddleware.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/ConstraintMiddleware.java
index 50977406f..c7251429f 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/ConstraintMiddleware.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/ConstraintMiddleware.java
@@ -1,10 +1,10 @@
 package com.github.kaktushose.jda.commands.dispatching.middleware.impl;
 
 import com.github.kaktushose.jda.commands.definitions.interactions.command.SlashCommandDefinition;
-import com.github.kaktushose.jda.commands.dispatching.ImplementationRegistry;
 import com.github.kaktushose.jda.commands.dispatching.context.InvocationContext;
 import com.github.kaktushose.jda.commands.dispatching.events.Event;
 import com.github.kaktushose.jda.commands.dispatching.middleware.Middleware;
+import com.github.kaktushose.jda.commands.embeds.error.ErrorMessageFactory;
 import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -14,15 +14,15 @@
 
 /// A [Middleware] implementation that will check the parameter constraints a [SlashCommandDefinition] might have.
 ///
-/// @see com.github.kaktushose.jda.commands.dispatching.validation.ValidatorRegistry ValidatorRegistry
+/// @see com.github.kaktushose.jda.commands.dispatching.validation.internal.Validators ValidatorRegistry
 public class ConstraintMiddleware implements Middleware {
 
     private static final Logger log = LoggerFactory.getLogger(ConstraintMiddleware.class);
 
-    private final ImplementationRegistry implementationRegistry;
+    private final ErrorMessageFactory errorMessageFactory;
 
-    public ConstraintMiddleware(ImplementationRegistry implementationRegistry) {
-        this.implementationRegistry = implementationRegistry;
+    public ConstraintMiddleware(ErrorMessageFactory errorMessageFactory) {
+        this.errorMessageFactory = errorMessageFactory;
     }
 
     /// Checks if all parameters fulfill their constraints. Will cancel the [InvocationContext] if a parameter
@@ -44,7 +44,7 @@ public void accept(@NotNull InvocationContext<?> context) {
             for (var constraint : optionData.constraints()) {
                 log.debug("Found constraint {} for parameter {}", constraint, optionData.type().getName());
                 if (!constraint.validator().apply(argument, constraint.annotation(), context)) {
-                    context.cancel(implementationRegistry.getErrorMessageFactory().getConstraintFailedMessage(context, constraint));
+                    context.cancel(errorMessageFactory.getConstraintFailedMessage(context, constraint));
                     log.debug("Constraint failed!");
                     return;
                 }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/CooldownMiddleware.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/CooldownMiddleware.java
index 81a6f7aa3..255d2794f 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/CooldownMiddleware.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/CooldownMiddleware.java
@@ -3,9 +3,9 @@
 import com.github.kaktushose.jda.commands.annotations.interactions.Cooldown;
 import com.github.kaktushose.jda.commands.definitions.interactions.command.SlashCommandDefinition;
 import com.github.kaktushose.jda.commands.definitions.interactions.command.SlashCommandDefinition.CooldownDefinition;
-import com.github.kaktushose.jda.commands.dispatching.ImplementationRegistry;
 import com.github.kaktushose.jda.commands.dispatching.context.InvocationContext;
 import com.github.kaktushose.jda.commands.dispatching.middleware.Middleware;
+import com.github.kaktushose.jda.commands.embeds.error.ErrorMessageFactory;
 import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -27,10 +27,10 @@ public class CooldownMiddleware implements Middleware {
     private static final Logger log = LoggerFactory.getLogger(CooldownMiddleware.class);
     private final Map<Long, Set<CooldownEntry>> activeCooldowns = new ConcurrentHashMap<>();
 
-    private final ImplementationRegistry implementationRegistry;
+    private final ErrorMessageFactory errorMessageFactory;
 
-    public CooldownMiddleware(ImplementationRegistry implementationRegistry) {
-        this.implementationRegistry = implementationRegistry;
+    public CooldownMiddleware(ErrorMessageFactory errorMessageFactory) {
+        this.errorMessageFactory = errorMessageFactory;
     }
 
     /// Checks if an active cooldown for the given [SlashCommandDefinition] exists and will eventually cancel the
@@ -54,7 +54,7 @@ public void accept(@NotNull InvocationContext<?> context) {
             if (remaining <= 0) {
                 activeCooldowns.get(id).remove(entry);
             } else {
-                context.cancel(implementationRegistry.getErrorMessageFactory().getCooldownMessage(context, remaining));
+                context.cancel(errorMessageFactory.getCooldownMessage(context, remaining));
                 log.debug("Command has a remaining cooldown of {} ms!", remaining);
                 return;
             }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/PermissionsMiddleware.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/PermissionsMiddleware.java
index 047dba263..179f26135 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/PermissionsMiddleware.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/PermissionsMiddleware.java
@@ -1,9 +1,9 @@
 package com.github.kaktushose.jda.commands.dispatching.middleware.impl;
 
 import com.github.kaktushose.jda.commands.annotations.interactions.Permissions;
-import com.github.kaktushose.jda.commands.dispatching.ImplementationRegistry;
 import com.github.kaktushose.jda.commands.dispatching.context.InvocationContext;
 import com.github.kaktushose.jda.commands.dispatching.middleware.Middleware;
+import com.github.kaktushose.jda.commands.embeds.error.ErrorMessageFactory;
 import com.github.kaktushose.jda.commands.permissions.PermissionsProvider;
 import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.User;
@@ -26,10 +26,12 @@ public class PermissionsMiddleware implements Middleware {
 
     private static final Logger log = LoggerFactory.getLogger(PermissionsMiddleware.class);
 
-    private final ImplementationRegistry implementationRegistry;
+    private final PermissionsProvider permissionsProvider;
+    private final ErrorMessageFactory errorMessageFactory;
 
-    public PermissionsMiddleware(ImplementationRegistry implementationRegistry) {
-        this.implementationRegistry = implementationRegistry;
+    public PermissionsMiddleware(PermissionsProvider permissionsProvider, ErrorMessageFactory errorMessageFactory) {
+        this.permissionsProvider = permissionsProvider;
+        this.errorMessageFactory = errorMessageFactory;
     }
 
     /// Checks if the [User] and respectively the [Member] has the permission to execute the command.
@@ -38,7 +40,7 @@ public PermissionsMiddleware(ImplementationRegistry implementationRegistry) {
     @Override
     public void accept(@NotNull InvocationContext<?> context) {
         log.debug("Checking permissions...");
-        PermissionsProvider provider = implementationRegistry.getPermissionsProvider();
+        PermissionsProvider provider = permissionsProvider;
         GenericInteractionCreateEvent event = context.event();
 
         boolean hasPerms;
@@ -48,7 +50,7 @@ public void accept(@NotNull InvocationContext<?> context) {
             hasPerms = provider.hasPermission(event.getUser(), context);
         }
         if (!hasPerms) {
-            context.cancel(implementationRegistry.getErrorMessageFactory().getInsufficientPermissionsMessage(context));
+            context.cancel(errorMessageFactory.getInsufficientPermissionsMessage(context));
             log.debug("Insufficient permissions!");
             return;
         }
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/internal/Middlewares.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/internal/Middlewares.java
new file mode 100644
index 000000000..12a005293
--- /dev/null
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/internal/Middlewares.java
@@ -0,0 +1,58 @@
+package com.github.kaktushose.jda.commands.dispatching.middleware.internal;
+
+import com.github.kaktushose.jda.commands.dispatching.middleware.Middleware;
+import com.github.kaktushose.jda.commands.dispatching.middleware.Priority;
+import com.github.kaktushose.jda.commands.dispatching.middleware.impl.ConstraintMiddleware;
+import com.github.kaktushose.jda.commands.dispatching.middleware.impl.CooldownMiddleware;
+import com.github.kaktushose.jda.commands.dispatching.middleware.impl.PermissionsMiddleware;
+import com.github.kaktushose.jda.commands.embeds.error.ErrorMessageFactory;
+import com.github.kaktushose.jda.commands.permissions.PermissionsProvider;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.*;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+
+/// Central registry for all [Middleware]s.
+public class Middlewares {
+
+    private final SortedMap<Priority, Set<Middleware>> middlewares;
+
+    public Middlewares(@NotNull Set<Map.Entry<Priority, Middleware>> userDefined, @NotNull ErrorMessageFactory errorMessageFactory, @NotNull PermissionsProvider permissionsProvider) {
+        SortedMap<Priority, Set<Middleware>> middlewareMap = new TreeMap<>(Map.of(
+                Priority.PERMISSIONS, new HashSet<>(List.of(new PermissionsMiddleware(permissionsProvider, errorMessageFactory))),
+                Priority.HIGH, new HashSet<>(),
+                Priority.NORMAL, new HashSet<>(List.of(new ConstraintMiddleware(errorMessageFactory), new CooldownMiddleware(errorMessageFactory))),
+                Priority.LOW, new HashSet<>()
+        ));
+
+        userDefined.forEach(entry -> middlewareMap.get(entry.getKey()).add(entry.getValue()));
+
+        middlewareMap.computeIfPresent(Priority.PERMISSIONS, (_, set) -> Collections.unmodifiableSet(set));
+        middlewareMap.computeIfPresent(Priority.HIGH, (_, set) -> Collections.unmodifiableSet(set));
+        middlewareMap.computeIfPresent(Priority.NORMAL, (_, set) -> Collections.unmodifiableSet(set));
+        middlewareMap.computeIfPresent(Priority.LOW, (_, set) -> Collections.unmodifiableSet(set));
+
+        this.middlewares = Collections.unmodifiableSortedMap(middlewareMap);
+    }
+
+    /// Returns a set of all registered [Middleware]s, regardless of their priority.
+    ///
+    /// @return a set of all registered middlewares [Middleware]s
+    @NotNull
+    public Set<Middleware> getMiddlewares() {
+        return middlewares.sequencedValues()
+                .stream()
+                .flatMap(Collection::stream)
+                .collect(Collectors.toUnmodifiableSet());
+    }
+
+    /// Executed the given task for all registered [Middleware]s ordered by their [Priority]
+    /// @param task The task to be executed
+    public void forAllOrdered(@NotNull Consumer<Middleware> task) {
+        for (Set<Middleware> value : middlewares.values()) {
+            value.forEach(task);
+        }
+    }
+
+}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/GlobalReplyConfig.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/GlobalReplyConfig.java
deleted file mode 100644
index b36322302..000000000
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/GlobalReplyConfig.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.github.kaktushose.jda.commands.dispatching.reply;
-
-import com.github.kaktushose.jda.commands.annotations.interactions.ReplyConfig;
-
-/// Will be used if no [ReplyConfig] annotation is present.
-public class GlobalReplyConfig {
-
-    /// Whether to send ephemeral replies. Default value is `false`.
-    ///
-    /// Ephemeral messages have some limitations and will be removed once the user restarts their client.
-    /// Limitations:
-    /// - Cannot contain any files/ attachments
-    /// - Cannot be reacted to
-    /// - Cannot be retrieved
-    public static boolean ephemeral = false;
-
-    /// Whether to keep the original components when editing a message. Default value is `true`.
-    ///
-    /// More formally, if editing a message and `keepComponents` is `true`, the original message will first be queried and
-    /// its components get added to the reply before it is sent.
-    public static boolean keepComponents = true;
-
-    /// Whether to edit the original message or to send a new one. Default value is `true`.
-    ///
-    /// The original message is always the very first reply that was sent. E.g. for a slash command event, which was
-    /// replied to with a text message and a button, the original message is that very reply.
-    ///
-    /// Subsequent replies to the same slash command event or the button event are not affected.
-    public static boolean editReply = true;
-
-}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/MessageReply.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/MessageReply.java
index 59327768d..a278781d8 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/MessageReply.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/MessageReply.java
@@ -55,14 +55,6 @@ public MessageReply(@NotNull GenericInteractionCreateEvent event,
         this.builder = new MessageCreateBuilder();
     }
 
-    /// Constructs a new MessageReply.
-    ///
-    /// @param event      the corresponding [GenericInteractionCreateEvent]
-    /// @param definition the corresponding [InteractionDefinition]. This is mostly needed by the [ConfigurableReply]
-    public MessageReply(@NotNull GenericInteractionCreateEvent event, @NotNull InteractionDefinition definition) {
-        this(event, definition, definition.replyConfig());
-    }
-
     /// Constructs a new MessageReply.
     ///
     /// @param reply the [MessageReply] to copy
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/ValidatorRegistry.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/ValidatorRegistry.java
deleted file mode 100644
index 339357657..000000000
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/ValidatorRegistry.java
+++ /dev/null
@@ -1,89 +0,0 @@
-package com.github.kaktushose.jda.commands.dispatching.validation;
-
-import com.github.kaktushose.jda.commands.annotations.constraints.*;
-import com.github.kaktushose.jda.commands.dispatching.validation.impl.*;
-import org.jetbrains.annotations.NotNull;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.lang.annotation.Annotation;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Optional;
-
-/// Central registry for all [Validator]s.
-///
-/// @see Validator
-public class ValidatorRegistry {
-
-    private final Logger log = LoggerFactory.getLogger(ValidatorRegistry.class);
-    private final Map<Class<? extends Annotation>, Validator> validators;
-
-    /// Constructs a new ValidatorRegistry. This will register the following [Validator]s by default:
-    ///
-    ///   - [MinimumValidator]
-    ///   - [MaximumValidator]
-    ///   - [RoleValidator]
-    ///   - [NotRoleValidator]
-    ///   - [PermissionValidator]
-    ///   - [NotPermissionValidator]
-    ///   - [UserValidator]
-    ///   - [NotUserValidator]
-    public ValidatorRegistry() {
-        validators = new HashMap<>();
-        // default types
-        register(Min.class, new MinimumValidator());
-        register(Max.class, new MaximumValidator());
-
-        // jda specific
-        register(Role.class, new RoleValidator());
-        register(NotRole.class, new NotRoleValidator());
-        register(Perm.class, new PermissionValidator());
-        register(NotPerm.class, new NotPermissionValidator());
-        register(User.class, new UserValidator());
-        register(NotUser.class, new NotUserValidator());
-    }
-
-    /// Register a [Validator] and map it to an annotation. Each annotation can only map to one [Validator].
-    ///
-    /// @param annotation the type of the annotation to map the [Validator] to
-    /// @param validator  the [Validator] to map
-    /// @throws IllegalArgumentException if the annotation class isn't annotated with [Constraint]
-    public void register(@NotNull Class<? extends Annotation> annotation, @NotNull Validator validator) {
-        if (!annotation.isAnnotationPresent(Constraint.class)) {
-            throw new IllegalArgumentException(Constraint.class.getCanonicalName() + " annotation must be present!");
-        }
-        validators.put(annotation, validator);
-        log.debug("Registered validator {} for annotation {}", validator.getClass().getName(), annotation.getName());
-    }
-
-    /// Unregisters the [Validator] mapped to the given annotation.
-    ///
-    /// @param annotation the class of the annotation to unregister
-    public void unregister(Class<?> annotation) {
-        validators.remove(annotation);
-        log.debug("Unregistered validator for annotation {}", annotation.getName());
-    }
-
-    /// Gets a [Validator] based on the annotation and the type to validate. Returns an empty [Optional] if
-    /// the [Validator] cannot validate the given type.
-    ///
-    /// @param annotation the class of the annotation
-    /// @param type       the type to validate
-    /// @return an [Optional] holding the [Validator]
-    public Optional<Validator> get(@NotNull Class<?> annotation, @NotNull Class<?> type) {
-        Validator validator = validators.get(annotation);
-
-        if (validator == null || !annotation.isAnnotationPresent(Constraint.class)) {
-            return Optional.empty();
-        }
-
-        Constraint constraint = annotation.getAnnotation(Constraint.class);
-        if (Arrays.stream(constraint.value()).noneMatch(t -> t.isAssignableFrom(type))) {
-            return Optional.empty();
-        }
-
-        return Optional.of(validator);
-    }
-}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/internal/Validators.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/internal/Validators.java
new file mode 100644
index 000000000..844a568f2
--- /dev/null
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/internal/Validators.java
@@ -0,0 +1,66 @@
+package com.github.kaktushose.jda.commands.dispatching.validation.internal;
+
+import com.github.kaktushose.jda.commands.annotations.constraints.*;
+import com.github.kaktushose.jda.commands.dispatching.validation.Validator;
+import com.github.kaktushose.jda.commands.dispatching.validation.impl.*;
+import org.jetbrains.annotations.NotNull;
+
+import java.lang.annotation.Annotation;
+import java.util.*;
+
+/// Central registry for all [Validator]s.
+///
+/// @see Validator
+public class Validators {
+    private final Map<Class<? extends Annotation>, Validator> validators;
+
+    /// Constructs a new Validators. This will register the following [Validator]s by default:
+    ///
+    ///   - [MinimumValidator]
+    ///   - [MaximumValidator]
+    ///   - [RoleValidator]
+    ///   - [NotRoleValidator]
+    ///   - [PermissionValidator]
+    ///   - [NotPermissionValidator]
+    ///   - [UserValidator]
+    ///   - [NotUserValidator]
+    public Validators(@NotNull Map<Class<? extends Annotation>, @NotNull Validator> validators) {
+        HashMap<Class<? extends Annotation>, Validator> validatorMap = new HashMap<>(validators);
+        validatorMap.putAll(Map.of(
+                // default types
+                Min.class, new MinimumValidator(),
+                Max.class, new MaximumValidator(),
+
+                // jda specific
+                Role.class, new RoleValidator(),
+                NotRole.class, new NotRoleValidator(),
+                Perm.class, new PermissionValidator(),
+                NotPerm.class, new NotPermissionValidator(),
+                User.class, new UserValidator(),
+                NotUser.class, new NotUserValidator()
+        ));
+        this.validators = Collections.unmodifiableMap(validatorMap);
+    }
+
+    /// Gets a [Validator] based on the annotation and the type to validate. Returns an empty [Optional] if
+    /// the [Validator] cannot validate the given type.
+    ///
+    /// @param annotation the class of the annotation
+    /// @param type       the type to validate
+    /// @return an [Optional] holding the [Validator]
+    @NotNull
+    public Optional<Validator> get(@NotNull Class<?> annotation, @NotNull Class<?> type) {
+        Validator validator = validators.get(annotation);
+
+        if (validator == null || !annotation.isAnnotationPresent(Constraint.class)) {
+            return Optional.empty();
+        }
+
+        Constraint constraint = annotation.getAnnotation(Constraint.class);
+        if (Arrays.stream(constraint.value()).noneMatch(t -> t.isAssignableFrom(type))) {
+            return Optional.empty();
+        }
+
+        return Optional.of(validator);
+    }
+}
diff --git a/src/main/java/com/github/kaktushose/jda/commands/internal/Helpers.java b/src/main/java/com/github/kaktushose/jda/commands/internal/Helpers.java
index 3c6f7e4e4..4e094ea71 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/internal/Helpers.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/internal/Helpers.java
@@ -1,12 +1,10 @@
 package com.github.kaktushose.jda.commands.internal;
 
 import com.github.kaktushose.jda.commands.annotations.interactions.Permissions;
-import com.github.kaktushose.jda.commands.annotations.interactions.ReplyConfig;
 import com.github.kaktushose.jda.commands.definitions.description.MethodDescription;
 import com.github.kaktushose.jda.commands.definitions.description.ParameterDescription;
 import com.github.kaktushose.jda.commands.definitions.interactions.InteractionDefinition;
 import com.github.kaktushose.jda.commands.definitions.interactions.MethodBuildContext;
-import com.github.kaktushose.jda.commands.dispatching.reply.GlobalReplyConfig;
 import com.github.kaktushose.jda.commands.embeds.error.ErrorMessageFactory.ErrorContext;
 import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.channel.middleman.GuildChannel;
@@ -79,25 +77,6 @@ public static Set<String> permissions(@NotNull MethodBuildContext context) {
         return context.permissions();
     }
 
-    /// Constructs the [InteractionDefinition.ReplyConfig ReplyConfig] based on the passed [Method].
-    ///
-    /// @param method the [Method] to use
-    /// @return the [InteractionDefinition.ReplyConfig ReplyConfig]
-    /// @implNote This will first attempt to use the [ReplyConfig] annotation of the method and then of the class.
-    /// If neither is present will fall back to the [GlobalReplyConfig].
-    @NotNull
-    public static InteractionDefinition.ReplyConfig replyConfig(@NotNull Method method) {
-        var global = method.getDeclaringClass().getAnnotation(ReplyConfig.class);
-        var local = method.getAnnotation(ReplyConfig.class);
-
-        if (global == null && local == null)
-            return new InteractionDefinition.ReplyConfig();
-        if (local == null)
-            return new InteractionDefinition.ReplyConfig(global);
-
-        return new InteractionDefinition.ReplyConfig(local);
-    }
-
     /// Checks if the given parameter is present at the [Method] at the given index.
     ///
     /// @param method the [Method] to check
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
index 76a58cfbd..96ae27f06 100644
--- a/src/main/java/module-info.java
+++ b/src/main/java/module-info.java
@@ -3,7 +3,7 @@
     requires com.google.gson;
     requires jsr305;
     requires net.dv8tion.jda;
-    requires org.jetbrains.annotations;
+    requires transitive org.jetbrains.annotations;
     requires org.reflections;
     requires java.desktop;
     requires org.slf4j;
@@ -41,10 +41,8 @@
     exports com.github.kaktushose.jda.commands.dispatching.events.interactions;
 
     exports com.github.kaktushose.jda.commands.dispatching.middleware;
-    exports com.github.kaktushose.jda.commands.dispatching.middleware.impl;
 
     exports com.github.kaktushose.jda.commands.dispatching.validation;
-    exports com.github.kaktushose.jda.commands.dispatching.validation.impl;
 
     // embed
     exports com.github.kaktushose.jda.commands.embeds;
diff --git a/src/test/java/adapting/TypeAdapterRegistryTest.java b/src/test/java/adapting/TypeAdapterRegistryTest.java
index 783eea028..bb8ac52a7 100644
--- a/src/test/java/adapting/TypeAdapterRegistryTest.java
+++ b/src/test/java/adapting/TypeAdapterRegistryTest.java
@@ -4,11 +4,11 @@
 //import adapting.mock.TypeAdapterRegistryTestController;
 //import com.github.kaktushose.jda.commands.annotations.interactions.Interaction;
 //import com.github.kaktushose.jda.commands.dependency.DefaultDependencyInjector;
-//import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapterRegistry;
+//import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapters;
 //import com.github.kaktushose.jda.commands.dispatching.adapter.impl.IntegerAdapter;
 //import com.github.kaktushose.jda.commands.dispatching.events.interactions.CommandEvent;
-//import com.github.kaktushose.jda.commands.dispatching.middleware.MiddlewareRegistry;
-//import com.github.kaktushose.jda.commands.dispatching.validation.ValidatorRegistry;
+//import com.github.kaktushose.jda.commands.dispatching.middleware.Middlewares;
+//import com.github.kaktushose.jda.commands.dispatching.validation.Validators;
 //import com.github.kaktushose.jda.commands.reflect.CooldownDefinition;
 //import com.github.kaktushose.jda.commands.reflect.ImplementationRegistry;
 //import com.github.kaktushose.jda.commands.reflect.InteractionRegistry;
@@ -27,26 +27,26 @@
 //public class TypeAdapterRegistryTest {
 //
 //    private static Class<?> controller;
-//    private static ValidatorRegistry validator;
-//    private static TypeAdapterRegistry adapter;
-//    private TypeAdapterRegistry registry;
+//    private static Validators validator;
+//    private static TypeAdapters adapter;
+//    private TypeAdapters registry;
 //
 //    @BeforeAll
 //    public static void setup() {
 //        TypeAdapterRegistryTestController instance = new TypeAdapterRegistryTestController();
 //        controller = instance.getClass();
-//        validator = new ValidatorRegistry();
-//        adapter = new TypeAdapterRegistry();
+//        validator = new Validators();
+//        adapter = new TypeAdapters();
 //    }
 //
 //    @BeforeEach
 //    public void cleanup() {
-//        registry = new TypeAdapterRegistry();
+//        registry = new TypeAdapters();
 //    }
 //
 //    @Test
 //    public void register_withNewTypeAndNewAdapter_ShouldAdd() {
-//        registry = new TypeAdapterRegistry();
+//        registry = new TypeAdapters();
 //        registry.register(CustomType.class, new CustomTypeAdapter());
 //
 //        assertTrue(registry.exists(CustomType.class));
@@ -54,7 +54,7 @@
 //
 //    @Test
 //    public void register_withExistingTypeAndNewAdapter_ShouldOverride() {
-//        registry = new TypeAdapterRegistry();
+//        registry = new TypeAdapters();
 //        CustomTypeAdapter adapter = new CustomTypeAdapter();
 //
 //        assertEquals(IntegerAdapter.class, registry.get(Integer.class).get().getClass());
@@ -65,7 +65,7 @@
 //
 //    @Test
 //    public void unregister_withExistingType_ShouldRemove() {
-//        registry = new TypeAdapterRegistry();
+//        registry = new TypeAdapters();
 //
 //        assertTrue(registry.exists(Integer.class));
 //        registry.unregister(Integer.class);
@@ -152,15 +152,15 @@
 //        SlashCommandContext context = new SlashCommandContext(
 //                new SlashCommandInteractionEventMock(),
 //                new InteractionRegistry(
-//                        new ValidatorRegistry(),
+//                        new Validators(),
 //                        new DefaultDependencyInjector(),
 //                        ResourceBundleLocalizationFunction.empty().build()
 //                ),
 //                new ImplementationRegistry(
 //                        new DefaultDependencyInjector(),
-//                        new MiddlewareRegistry(),
-//                        new TypeAdapterRegistry(),
-//                        new ValidatorRegistry()
+//                        new Middlewares(),
+//                        new TypeAdapters(),
+//                        new Validators()
 //                )
 //        );
 //        context.setInput(input);
diff --git a/src/test/java/adapting/mock/GuildMock.java b/src/test/java/adapting/mock/GuildMock.java
index 11eafa5c7..b77a76436 100644
--- a/src/test/java/adapting/mock/GuildMock.java
+++ b/src/test/java/adapting/mock/GuildMock.java
@@ -538,6 +538,11 @@ public TextChannel getCommunityUpdatesChannel() {
         return null;
     }
 
+    @Override
+    public @Nullable TextChannel getSafetyAlertsChannel() {
+        return null;
+    }
+
     @Nullable
     @Override
     public Member getOwner() {
diff --git a/src/test/java/adapting/mock/JDACommandsMock.java b/src/test/java/adapting/mock/JDACommandsMock.java
index 12e7b5a22..ecad7f793 100644
--- a/src/test/java/adapting/mock/JDACommandsMock.java
+++ b/src/test/java/adapting/mock/JDACommandsMock.java
@@ -2,10 +2,10 @@
 
 import com.github.kaktushose.jda.commands.definitions.interactions.InteractionRegistry;
 import com.github.kaktushose.jda.commands.dependency.DependencyInjector;
-import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapterRegistry;
+import com.github.kaktushose.jda.commands.dispatching.adapter.internal.TypeAdapters;
 import com.github.kaktushose.jda.commands.dispatching.JDAEventListener;
-import com.github.kaktushose.jda.commands.dispatching.middleware.MiddlewareRegistry;
-import com.github.kaktushose.jda.commands.dispatching.validation.ValidatorRegistry;
+import com.github.kaktushose.jda.commands.dispatching.middleware.internal.Middlewares;
+import com.github.kaktushose.jda.commands.dispatching.validation.internal.Validators;
 import com.github.kaktushose.jda.commands.internal.JDAContext;
 import com.github.kaktushose.jda.commands.internal.register.SlashCommandUpdater;
 
@@ -13,9 +13,9 @@
 public record JDACommandsMock(
         JDAContext jdaContext,
         JDAEventListener JDAEventListener,
-        MiddlewareRegistry middlewareRegistry,
-        TypeAdapterRegistry adapterRegistry,
-        ValidatorRegistry validatorRegistry,
+        Middlewares middlewareRegistry,
+        TypeAdapters adapterRegistry,
+        Validators validatorRegistry,
         DependencyInjector dependencyInjector,
         InteractionRegistry interactionRegistry,
         SlashCommandUpdater updater) {
diff --git a/src/test/java/adapting/mock/JDAMock.java b/src/test/java/adapting/mock/JDAMock.java
index 5e840d744..d1eb1fd5e 100644
--- a/src/test/java/adapting/mock/JDAMock.java
+++ b/src/test/java/adapting/mock/JDAMock.java
@@ -5,6 +5,7 @@
 import net.dv8tion.jda.api.entities.*;
 import net.dv8tion.jda.api.entities.channel.Channel;
 import net.dv8tion.jda.api.entities.channel.concrete.*;
+import net.dv8tion.jda.api.entities.emoji.ApplicationEmoji;
 import net.dv8tion.jda.api.entities.emoji.RichCustomEmoji;
 import net.dv8tion.jda.api.entities.sticker.StickerPack;
 import net.dv8tion.jda.api.entities.sticker.StickerSnowflake;
@@ -361,6 +362,21 @@ public SnowflakeCacheView<RichCustomEmoji> getEmojiCache() {
         return null;
     }
 
+    @Override
+    public @NotNull RestAction<ApplicationEmoji> createApplicationEmoji(@NotNull String s, @NotNull Icon icon) {
+        return null;
+    }
+
+    @Override
+    public @NotNull RestAction<List<ApplicationEmoji>> retrieveApplicationEmojis() {
+        return null;
+    }
+
+    @Override
+    public @NotNull RestAction<ApplicationEmoji> retrieveApplicationEmojiById(@NotNull String s) {
+        return null;
+    }
+
     @NotNull
     @Override
     public RestAction<StickerUnion> retrieveSticker(@NotNull StickerSnowflake stickerSnowflake) {
diff --git a/src/test/java/commands/SlashCommandDefinitionTest.java b/src/test/java/commands/SlashCommandDefinitionTest.java
index 62325a20f..3fe72049d 100644
--- a/src/test/java/commands/SlashCommandDefinitionTest.java
+++ b/src/test/java/commands/SlashCommandDefinitionTest.java
@@ -6,9 +6,8 @@
 import com.github.kaktushose.jda.commands.definitions.description.reflective.ReflectiveDescriptor;
 import com.github.kaktushose.jda.commands.definitions.interactions.MethodBuildContext;
 import com.github.kaktushose.jda.commands.definitions.interactions.command.SlashCommandDefinition;
-import com.github.kaktushose.jda.commands.dispatching.adapter.TypeAdapterRegistry;
 import com.github.kaktushose.jda.commands.dispatching.events.interactions.CommandEvent;
-import com.github.kaktushose.jda.commands.dispatching.validation.ValidatorRegistry;
+import com.github.kaktushose.jda.commands.dispatching.validation.internal.Validators;
 import net.dv8tion.jda.api.interactions.commands.localization.ResourceBundleLocalizationFunction;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
@@ -24,17 +23,13 @@
 public class SlashCommandDefinitionTest {
 
     private static Class<?> controller;
-    private static ValidatorRegistry validator;
+    private static Validators validator;
 
     @BeforeAll
     public static void setup() {
         controller = CommandDefinitionTestController.class;
 
-        validator = new ValidatorRegistry();
-
-        // make sure that this type is not registered before testing
-        TypeAdapterRegistry adapter = new TypeAdapterRegistry();
-        adapter.unregister(UnsupportedType.class);
+        validator = new Validators(Map.of());
     }
 
     public static MethodBuildContext getBuildContext(Method method) {
@@ -159,7 +154,7 @@ public void method_withOptionalAfterOptional_ShouldWork() throws NoSuchMethodExc
         assertEquals(2, definition.commandOptions().size());
         var parameters = List.copyOf(definition.commandOptions());
         assertEquals(String.class, parameters.get(0).type());
-        assertEquals(Integer.class, parameters.get(1).type());
+        assertEquals(int.class, parameters.get(1).type());
     }
 
     @Test
diff --git a/src/test/java/parameters/OptionDataDefinitionTest.java b/src/test/java/parameters/OptionDataDefinitionTest.java
index 355764fea..903ef19a2 100644
--- a/src/test/java/parameters/OptionDataDefinitionTest.java
+++ b/src/test/java/parameters/OptionDataDefinitionTest.java
@@ -3,8 +3,8 @@
 import com.github.kaktushose.jda.commands.annotations.constraints.Min;
 import com.github.kaktushose.jda.commands.definitions.description.ParameterDescription;
 import com.github.kaktushose.jda.commands.definitions.interactions.command.OptionDataDefinition;
-import com.github.kaktushose.jda.commands.dispatching.validation.ValidatorRegistry;
 import com.github.kaktushose.jda.commands.dispatching.validation.impl.MinimumValidator;
+import com.github.kaktushose.jda.commands.dispatching.validation.internal.Validators;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
@@ -13,18 +13,19 @@
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
+import java.util.Map;
 
 import static org.junit.jupiter.api.Assertions.*;
 
 public class OptionDataDefinitionTest {
 
     private static Class<?> controller;
-    private static ValidatorRegistry validatorRegistry;
+    private static Validators validatorRegistry;
 
     @BeforeAll
     public static void setup() {
         controller = ParameterTestController.class;
-        validatorRegistry = new ValidatorRegistry();
+        validatorRegistry = new Validators(Map.of());
     }
 
     private static ParameterDescription parameter(Parameter parameter) {
@@ -69,6 +70,18 @@ public void constraintMin_withLimit10_ShouldWork() throws NoSuchMethodException
         assertFalse(constraints.get(0).message().isEmpty());
     }
 
+    @Test
+    public void constraintMin_withLimit10Wrapped_ShouldWork() throws NoSuchMethodException {
+        Method method = controller.getDeclaredMethod("constraintWrapped", Integer.class);
+        OptionDataDefinition parameter = OptionDataDefinition.build(parameter(method.getParameters()[0]), false, validatorRegistry);
+
+        var constraints = List.copyOf(parameter.constraints());
+        assertEquals(1, parameter.constraints().size());
+        assertEquals(10, ((Min) constraints.get(0).annotation()).value());
+        assertEquals(MinimumValidator.class, constraints.get(0).validator().getClass());
+        assertFalse(constraints.get(0).message().isEmpty());
+    }
+
     @Test
     public void constraint_withMessage_ShouldWork() throws NoSuchMethodException {
         Method method = controller.getDeclaredMethod("constraintWithMessage", int.class);
diff --git a/src/test/java/parameters/ParameterTestController.java b/src/test/java/parameters/ParameterTestController.java
index 221964b1a..be17a76d8 100644
--- a/src/test/java/parameters/ParameterTestController.java
+++ b/src/test/java/parameters/ParameterTestController.java
@@ -21,6 +21,10 @@ public void constraint(@Min(10) int i) {
 
     }
 
+    public void constraintWrapped(@Min(10) Integer i) {
+
+    }
+
     public void constraintWithMessage(@Min(value = 10, message = "error message") int i) {
 
     }
diff --git a/src/test/java/reply/ReplyConfigTest.java b/src/test/java/reply/ReplyConfigTest.java
index 5ea237dc5..55a2f5e21 100644
--- a/src/test/java/reply/ReplyConfigTest.java
+++ b/src/test/java/reply/ReplyConfigTest.java
@@ -1,11 +1,19 @@
 package reply;
 
-import com.github.kaktushose.jda.commands.internal.Helpers;
-import com.github.kaktushose.jda.commands.dispatching.events.interactions.ComponentEvent;
-import com.github.kaktushose.jda.commands.dispatching.reply.GlobalReplyConfig;
+import com.github.kaktushose.jda.commands.annotations.interactions.Interaction;
+import com.github.kaktushose.jda.commands.definitions.description.reflective.ReflectiveDescriptor;
+import com.github.kaktushose.jda.commands.definitions.interactions.InteractionDefinition.ReplyConfig;
+import com.github.kaktushose.jda.commands.definitions.interactions.MethodBuildContext;
+import com.github.kaktushose.jda.commands.definitions.interactions.command.SlashCommandDefinition;
+import com.github.kaktushose.jda.commands.definitions.interactions.component.ButtonDefinition;
+import com.github.kaktushose.jda.commands.dispatching.validation.internal.Validators;
+import net.dv8tion.jda.api.interactions.commands.localization.ResourceBundleLocalizationFunction;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
+import java.util.Map;
+import java.util.Set;
+
 import static org.junit.jupiter.api.Assertions.*;
 
 public class ReplyConfigTest {
@@ -19,18 +27,37 @@ public static void setup() {
         customController = CustomController.class;
     }
 
+    private ReplyConfig getReplyConfig(Class<?> clazz, String method, ReplyConfig replyConfig) {
+        var description = new ReflectiveDescriptor().apply(clazz);
+        var definition = ButtonDefinition.build(
+                new MethodBuildContext(
+                        new Validators(Map.of()),
+                        ResourceBundleLocalizationFunction.empty().build(),
+                        clazz.getAnnotation(Interaction.class),
+                        Set.of(),
+                        SlashCommandDefinition.CooldownDefinition.build(null),
+                        description,
+                        description.methods().stream().filter(it -> it.name().equals(method)).findFirst().get(),
+                        Set.of()
+                )
+        ).orElseThrow();
+        return definition.replyConfig(replyConfig);
+    }
+
     @Test
     public void defaultController_withDefaultMethod_ShouldUseGlobalValues() throws NoSuchMethodException {
-        var config = Helpers.replyConfig(defaultController.getDeclaredMethod("defaultValues", ComponentEvent.class));
+        var fallback = new ReplyConfig();
+        var config = getReplyConfig(defaultController, "defaultValues", fallback);
 
-        assertEquals(config.ephemeral(), GlobalReplyConfig.ephemeral);
-        assertEquals(config.editReply(), GlobalReplyConfig.editReply);
-        assertEquals(config.keepComponents(), GlobalReplyConfig.keepComponents);
+
+        assertEquals(config.ephemeral(), fallback.ephemeral());
+        assertEquals(config.editReply(), fallback.editReply());
+        assertEquals(config.keepComponents(), fallback.keepComponents());
     }
 
     @Test
     public void defaultController_withCustomMethod_ShouldUseMethodValues() throws NoSuchMethodException {
-        var config = Helpers.replyConfig(defaultController.getDeclaredMethod("customValues", ComponentEvent.class));
+        var config = getReplyConfig(defaultController, "customValues", new ReplyConfig());
 
         assertTrue(config.ephemeral());
         assertFalse(config.editReply());
@@ -39,8 +66,7 @@ public void defaultController_withCustomMethod_ShouldUseMethodValues() throws No
 
     @Test
     public void customController_withDefaultMethod_ShouldUseControllerValues() throws NoSuchMethodException {
-        var config = Helpers.replyConfig(customController.getDeclaredMethod("defaultValues", ComponentEvent.class));
-
+        var config = getReplyConfig(customController, "defaultValues", new ReplyConfig());
         assertTrue(config.ephemeral());
         assertFalse(config.editReply());
         assertFalse(config.keepComponents());
@@ -48,8 +74,8 @@ public void customController_withDefaultMethod_ShouldUseControllerValues() throw
 
     @Test
     public void customController_withSameCustomMethod_ShouldBeEquals() throws NoSuchMethodException {
-        var first = Helpers.replyConfig(customController.getDeclaredMethod("defaultValues", ComponentEvent.class));
-        var second = Helpers.replyConfig(customController.getDeclaredMethod("sameValues", ComponentEvent.class));
+        var first = getReplyConfig(customController, "defaultValues", new ReplyConfig());
+        var second = getReplyConfig(customController, "sameValues", new ReplyConfig());
 
         assertEquals(first.ephemeral(), second.ephemeral());
         assertEquals(first.editReply(), second.editReply());
@@ -58,8 +84,7 @@ public void customController_withSameCustomMethod_ShouldBeEquals() throws NoSuch
 
     @Test
     public void customController_withDifferentCustomMethod_ShouldUseMethodValues() throws NoSuchMethodException {
-        var config = Helpers.replyConfig(customController.getDeclaredMethod("customValues", ComponentEvent.class));
-
+        var config = getReplyConfig(customController, "customValues", new ReplyConfig());
         assertFalse(config.ephemeral());
         assertTrue(config.editReply());
         assertTrue(config.keepComponents());

From c6fc5f9b4c65f539f6dc346e6085806f94777699 Mon Sep 17 00:00:00 2001
From: Kaktushose <42280757+Kaktushose@users.noreply.github.com>
Date: Tue, 7 Jan 2025 20:05:55 +0100
Subject: [PATCH 24/38] fix primitive type handling

---
 .../command/OptionDataDefinition.java         | 27 +++++++------------
 .../adapter/internal/TypeAdapters.java        | 18 ++++++++++---
 2 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/OptionDataDefinition.java b/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/OptionDataDefinition.java
index 6ca11cf08..4743abe6f 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/OptionDataDefinition.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/OptionDataDefinition.java
@@ -29,6 +29,7 @@
 import java.lang.reflect.Method;
 import java.util.*;
 
+import static com.github.kaktushose.jda.commands.dispatching.adapter.internal.TypeAdapters.PRIMITIVE_MAPPING;
 import static java.util.Map.entry;
 
 /// Representation of a slash command parameter.
@@ -52,27 +53,19 @@ public record OptionDataDefinition(
         @NotNull Collection<ConstraintDefinition> constraints
 ) implements Definition, JDAEntity<OptionData> {
 
-    private static final Map<Class<?>, Class<?>> PRIMITIVE_MAPPING = Map.of(
-            int.class, Integer.class,
-            double.class, Double.class,
-            byte.class, Byte.class,
-            float.class, Float.class,
-            boolean.class, Boolean.class,
-            short.class, Short.class,
-            long.class, Long.class,
-            char.class, Character.class
-    );
-
     private static final Map<Class<?>, OptionType> OPTION_TYPE_MAPPINGS = Map.ofEntries(
-            entry(Byte.class, OptionType.STRING),
-            entry(Short.class, OptionType.STRING),
+            entry(boolean.class, OptionType.BOOLEAN),
+            entry(Boolean.class, OptionType.BOOLEAN),
+            entry(short.class, OptionType.INTEGER),
+            entry(Short.class, OptionType.INTEGER),
+            entry(int.class, OptionType.INTEGER),
             entry(Integer.class, OptionType.INTEGER),
+            entry(long.class, OptionType.NUMBER),
             entry(Long.class, OptionType.NUMBER),
-            entry(Double.class, OptionType.NUMBER),
+            entry(float.class, OptionType.NUMBER),
             entry(Float.class, OptionType.NUMBER),
-            entry(Boolean.class, OptionType.BOOLEAN),
-            entry(Character.class, OptionType.STRING),
-            entry(String.class, OptionType.STRING),
+            entry(double.class, OptionType.NUMBER),
+            entry(Double.class, OptionType.NUMBER),
             entry(User.class, OptionType.USER),
             entry(Member.class, OptionType.USER),
             entry(GuildChannel.class, OptionType.CHANNEL),
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/internal/TypeAdapters.java b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/internal/TypeAdapters.java
index 09a3adf8a..0578a9787 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/internal/TypeAdapters.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/internal/TypeAdapters.java
@@ -10,6 +10,7 @@
 import net.dv8tion.jda.api.entities.channel.middleman.GuildChannel;
 import net.dv8tion.jda.api.entities.channel.middleman.GuildMessageChannel;
 import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -21,8 +22,20 @@
 /// Central registry for all type adapters.
 ///
 /// @see TypeAdapter
+@ApiStatus.Internal
 public class TypeAdapters {
 
+    public static final Map<Class<?>, Class<?>> PRIMITIVE_MAPPING = Map.of(
+            boolean.class, Boolean.class,
+            byte.class, Byte.class,
+            short.class, Short.class,
+            int.class, Integer.class,
+            long.class, Long.class,
+            float.class, Float.class,
+            double.class, Double.class,
+            char.class, Character.class
+    );
+
     public static final Map<Class<?>, Object> DEFAULT_MAPPINGS = Map.of(
             byte.class, ((byte) 0),
             short.class, ((short) 0),
@@ -57,7 +70,6 @@ public TypeAdapters(@NotNull Map<Class<?>, TypeAdapter<?>> parameterAdapters) {
         adapterMap.put(Character.class, new CharacterAdapter());
         adapterMap.put(Boolean.class, new BooleanAdapter());
         adapterMap.put(String.class, (TypeAdapter<String>) (raw, _) -> Optional.of(raw));
-        adapterMap.put(String[].class, (TypeAdapter<String>) (raw, _) -> Optional.of(raw));
 
         // jda specific
         adapterMap.put(Member.class, new MemberAdapter());
@@ -80,7 +92,7 @@ public TypeAdapters(@NotNull Map<Class<?>, TypeAdapter<?>> parameterAdapters) {
     /// @param type the type to check
     /// @return `true` if a type adapter exists
     public boolean exists(@Nullable Class<?> type) {
-        return parameterAdapters.containsKey(type);
+        return parameterAdapters.containsKey(PRIMITIVE_MAPPING.getOrDefault(type, type));
     }
 
     /// Retrieves a type adapter.
@@ -88,7 +100,7 @@ public boolean exists(@Nullable Class<?> type) {
     /// @param type the type to get the adapter for
     /// @return the type adapter or an empty Optional if none found
     public Optional<TypeAdapter<?>> get(@Nullable Class<?> type) {
-        return Optional.ofNullable(parameterAdapters.get(type));
+        return Optional.ofNullable(parameterAdapters.get(PRIMITIVE_MAPPING.getOrDefault(type, type)));
     }
 
 

From 40fc5c7b65a0980d67951d430c0df0b730c967b1 Mon Sep 17 00:00:00 2001
From: Kaktushose <42280757+Kaktushose@users.noreply.github.com>
Date: Tue, 7 Jan 2025 20:21:56 +0100
Subject: [PATCH 25/38] Update javadocs workflow to support multiple versions
 (#153)

* update workflow

* update workflow

* use aggregate goal instead of javadoc

* add java setup

* update workflows

* update workflow

* update workflow

* update workflow

* update workflow

* add legacy branch creation

* test

* test final

* clean up

---------

Co-authored-by: Nick Hensel <nickhensel25@icloud.com>
---
 .github/workflows/docs.yml     | 33 ------------------------
 .github/workflows/javadocs.yml | 47 ++++++++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+), 33 deletions(-)
 delete mode 100644 .github/workflows/docs.yml
 create mode 100644 .github/workflows/javadocs.yml

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
deleted file mode 100644
index 4824540b6..000000000
--- a/.github/workflows/docs.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-name: Documentation
-
-on:
-  push:
-    branches: [ main ]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-      - name: Generate Documentation
-        run: |
-          mvn javadoc:javadoc
-      - name: Checkout Docs Branch
-        run: |
-          git checkout docs
-          git pull
-      - name: Move Files
-        run: |
-          rm -rf ./docs
-          mv ./target/site/apidocs/ ./docs
-          rm -rf ./target
-      - name: Commit & Push Changes
-        run: |
-          git config --global user.email 41898282+github-actions[bot]@users.noreply.github.com
-          git config --global user.name github-actions[bot]
-          git add .
-          git commit -m "update documentation"
-          git push
diff --git a/.github/workflows/javadocs.yml b/.github/workflows/javadocs.yml
new file mode 100644
index 000000000..d93548e17
--- /dev/null
+++ b/.github/workflows/javadocs.yml
@@ -0,0 +1,47 @@
+name: Development Javadocs
+
+on:
+  push:
+    branches:
+      - development
+      - main
+      - 'legacy/*'
+  create:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: Setup Java
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '23'
+      - name: Generate Documentation
+        run: |
+          mvn javadoc:aggregate
+      - name: Find target directory
+        id: target_dir
+        run: |
+          branch=${GITHUB_REF#refs/heads/}
+          
+          if [ "$branch" == "development" ]; then
+            echo "name=development" >> "$GITHUB_OUTPUT"
+          elif [ "$branch" == "main" ]; then
+            echo "name=latest" >> "$GITHUB_OUTPUT"
+          elif [[ $branch == legacy/* ]]; then
+            echo "name=${branch#legacy/}" >> "$GITHUB_OUTPUT"
+          else
+            echo "name=ignore" >> "$GITHUB_OUTPUT"
+          fi
+      - name: Deploy docs
+        if: ${{ steps.target_dir.outputs.name != 'ignore' }}
+        uses: JamesIves/github-pages-deploy-action@v4
+        with:
+          folder: ./target/site/apidocs
+          branch: docs
+          target-folder: javadocs/${{ steps.target_dir.outputs.name }}

From 3d02a612d07c051e2fd7add891b34d652761b564 Mon Sep 17 00:00:00 2001
From: Kaktushose <42280757+Kaktushose@users.noreply.github.com>
Date: Tue, 7 Jan 2025 20:31:48 +0100
Subject: [PATCH 26/38] prepare release

---
 README.md |  6 +++---
 pom.xml   | 14 +-------------
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/README.md b/README.md
index 5b70b9ee9..c27981e5a 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![JDA-Version](https://img.shields.io/badge/JDA%20Version-5.2.2-important)](https://github.com/DV8FromTheWorld/JDA#download)
-[![Generic badge](https://img.shields.io/badge/Download-4.0.0--beta.2-green.svg)](https://github.com/Kaktushose/jda-commands/releases/latest)
-[![Java CI](https://github.com/Kaktushose/jda-commands/actions/workflows/ci.yml/badge.svg?branch=dev)](https://github.com/Kaktushose/jda-commands/actions/workflows/ci.yml)
+[![Generic badge](https://img.shields.io/badge/Download-4.0.0--beta.3-green.svg)](https://github.com/Kaktushose/jda-commands/releases/latest)
+[![Java CI](https://github.com/Kaktushose/jda-commands/actions/workflows/ci.yml/badge.svg?branch=main)](https://github.com/Kaktushose/jda-commands/actions/workflows/ci.yml)
 [![Codacy Badge](https://app.codacy.com/project/badge/Grade/f2b4367f6d0f42d89b7e51331f3ce299)](https://app.codacy.com/gh/Kaktushose/jda-commands/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_grade)
 [![Codacy Badge](https://app.codacy.com/project/badge/Coverage/f2b4367f6d0f42d89b7e51331f3ce299)](https://app.codacy.com/gh/Kaktushose/jda-commands/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_coverage)
 [![license-shield](https://img.shields.io/badge/License-Apache%202.0-lightgrey.svg)]()
@@ -15,7 +15,7 @@ any boilerplate code, so you can focus solely on the business logic of your bot
 
 | jda-commands                                                               | JDA | Text Commands | Interactions |
 |----------------------------------------------------------------------------|-----|---------------|--------------|
-| [4.0.0-beta.2](https://github.com/Kaktushose/jda-commands/releases/latest) | 5   | ❌             | ✅            |
+| [4.0.0-beta.3](https://github.com/Kaktushose/jda-commands/releases/latest) | 5   | ❌             | ✅            |
 | [3.0.0](https://github.com/Kaktushose/jda-commands/releases/tag/v3.0.0)    | 5   | ✅             | ❌            |
 | [2.2.0](https://github.com/Kaktushose/jda-commands/releases/tag/v.2.0.0)   | 4   | ✅             | ❌            |
 
diff --git a/pom.xml b/pom.xml
index 4f5ed9871..234c4bae3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,8 +6,7 @@
 
     <groupId>com.github.kaktushose</groupId>
     <artifactId>jda-commands</artifactId>
-    <version>4.0.0-beta.2</version>
-
+    <version>4.0.0-beta.3</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
@@ -128,16 +127,5 @@
             <artifactId>annotations</artifactId>
             <version>24.0.1</version>
         </dependency>
-        <!-- TODO remove dev dependencies -->
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-            <version>1.4.12</version>
-        </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-core</artifactId>
-            <version>1.4.12</version>
-        </dependency>
     </dependencies>
 </project>

From 694f65749f9a06d5068a133c50e8aaae5190f00d Mon Sep 17 00:00:00 2001
From: Kaktushose <42280757+Kaktushose@users.noreply.github.com>
Date: Fri, 10 Jan 2025 17:21:59 +0100
Subject: [PATCH 27/38] fix string select options not registering

---
 .../component/menu/StringSelectMenuDefinition.java     | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/menu/StringSelectMenuDefinition.java b/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/menu/StringSelectMenuDefinition.java
index d0a0466f1..89c71d5c7 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/menu/StringSelectMenuDefinition.java
+++ b/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/menu/StringSelectMenuDefinition.java
@@ -1,5 +1,6 @@
 package com.github.kaktushose.jda.commands.definitions.interactions.component.menu;
 
+import com.github.kaktushose.jda.commands.annotations.internal.SelectOptionContainer;
 import com.github.kaktushose.jda.commands.definitions.Definition;
 import com.github.kaktushose.jda.commands.definitions.description.ClassDescription;
 import com.github.kaktushose.jda.commands.definitions.description.MethodDescription;
@@ -50,11 +51,10 @@ public static Optional<StringSelectMenuDefinition> build(MethodBuildContext cont
 
         Set<SelectOptionDefinition> selectOptions = new HashSet<>();
         method.annotations().stream()
-                .filter(com.github.kaktushose.jda.commands.annotations.interactions.SelectOption.class::isInstance)
-                .map(com.github.kaktushose.jda.commands.annotations.interactions.SelectOption.class::cast)
-                .forEach(it -> {
-                    selectOptions.add(SelectOptionDefinition.build(it));
-                });
+                .filter(SelectOptionContainer.class::isInstance)
+                .map(SelectOptionContainer.class::cast)
+                .flatMap(it -> Arrays.stream(it.value()))
+                .forEach(it -> selectOptions.add(SelectOptionDefinition.build(it)));
 
         return Optional.of(new StringSelectMenuDefinition(
                 context.clazz(),

From 6fd505262ca6d37f128029cd7bfc078befa371fa Mon Sep 17 00:00:00 2001
From: Nick Hensel <nickhensel25@icloud.com>
Date: Sat, 11 Jan 2025 13:09:28 +0100
Subject: [PATCH 28/38] Use maven as build system and refactor to multi module
 project

---
 .gitignore                                    |   3 +
 gradle/libs.versions.toml                     |  20 ++
 gradle/wrapper/gradle-wrapper.jar             | Bin 0 -> 43583 bytes
 gradle/wrapper/gradle-wrapper.properties      |   7 +
 gradlew                                       | 252 ++++++++++++++++++
 gradlew.bat                                   |  94 +++++++
 jdac/build.gradle.kts                         |  48 ++++
 {src => jdac/src}/examples/BanCommand.java    |   0
 {src => jdac/src}/examples/CookieClicker.java |   0
 {src => jdac/src}/examples/Main.java          |   0
 {src => jdac/src}/examples/embeds.json        |   0
 .../src}/examples/scope/PremiumCommand.java   |   0
 .../examples/scope/PremiumGuildsProvider.java |   0
 .../kaktushose/jda/commands/JDACommands.java  |   0
 .../jda/commands/JDACommandsBuilder.java      |   0
 .../commands/annotations/Implementation.java  |   0
 .../jda/commands/annotations/Inject.java      |   0
 .../jda/commands/annotations/Produces.java    |   0
 .../annotations/constraints/Constraint.java   |   0
 .../commands/annotations/constraints/Max.java |   0
 .../commands/annotations/constraints/Min.java |   0
 .../annotations/constraints/NotPerm.java      |   0
 .../annotations/constraints/NotRole.java      |   0
 .../annotations/constraints/NotUser.java      |   0
 .../annotations/constraints/Perm.java         |   0
 .../annotations/constraints/Role.java         |   0
 .../annotations/constraints/User.java         |   0
 .../annotations/constraints/package-info.java |   0
 .../interactions/AutoComplete.java            |   0
 .../annotations/interactions/Button.java      |   0
 .../annotations/interactions/Choices.java     |   0
 .../interactions/CommandScope.java            |   0
 .../interactions/ContextCommand.java          |   0
 .../annotations/interactions/Cooldown.java    |   0
 .../interactions/EntitySelectMenu.java        |   0
 .../annotations/interactions/Interaction.java |   0
 .../annotations/interactions/Modal.java       |   0
 .../annotations/interactions/Optional.java    |   0
 .../annotations/interactions/Param.java       |   0
 .../annotations/interactions/Permissions.java |   0
 .../annotations/interactions/ReplyConfig.java |   0
 .../interactions/SelectOption.java            |   0
 .../interactions/SlashCommand.java            |   0
 .../interactions/StringSelectMenu.java        |   0
 .../annotations/interactions/TextInput.java   |   0
 .../interactions/package-info.java            |   0
 .../internal/SelectOptionContainer.java       |   0
 .../annotations/internal/package-info.java    |   0
 .../commands/annotations/package-info.java    |   0
 .../jda/commands/definitions/Definition.java  |   2 +-
 .../description/ClassDescription.java         |   0
 .../definitions/description/ClassFinder.java  |   0
 .../definitions/description/Description.java  |   0
 .../definitions/description/Descriptor.java   |   0
 .../definitions/description/Invoker.java      |   0
 .../description/MethodDescription.java        |   0
 .../description/ParameterDescription.java     |   0
 .../definitions/description/package-info.java |   0
 .../reflective/ReflectiveClassFinder.java     |   0
 .../reflective/ReflectiveDescriptor.java      |   0
 .../description/reflective/package-info.java  |   0
 .../features/CustomIdJDAEntity.java           |   0
 .../definitions/features/JDAEntity.java       |   0
 .../features/internal/Invokable.java          |   0
 .../definitions/features/package-info.java    |   0
 .../interactions/AutoCompleteDefinition.java  |   0
 .../definitions/interactions/CustomId.java    |   0
 .../interactions/InteractionDefinition.java   |   0
 .../interactions/InteractionRegistry.java     |   0
 .../interactions/MethodBuildContext.java      |   0
 .../interactions/ModalDefinition.java         |   0
 .../command/CommandDefinition.java            |   0
 .../command/ContextCommandDefinition.java     |   0
 .../command/OptionDataDefinition.java         |   0
 .../command/SlashCommandDefinition.java       |   0
 .../interactions/command/package-info.java    |   0
 .../component/ButtonDefinition.java           |   0
 .../component/ComponentDefinition.java        |   0
 .../menu/EntitySelectMenuDefinition.java      |   0
 .../component/menu/SelectMenuDefinition.java  |   0
 .../menu/StringSelectMenuDefinition.java      |   0
 .../component/menu/package-info.java          |   0
 .../interactions/component/package-info.java  |   0
 .../interactions/package-info.java            |   0
 .../dependency/DefaultDependencyInjector.java |   0
 .../dependency/DependencyInjector.java        |   0
 .../jda/commands/dependency/package-info.java |   0
 .../dispatching/JDAEventListener.java         |   0
 .../jda/commands/dispatching/Runtime.java     |   0
 .../dispatching/adapter/TypeAdapter.java      |   0
 .../adapter/impl/AudioChannelAdapter.java     |   0
 .../adapter/impl/BooleanAdapter.java          |   0
 .../dispatching/adapter/impl/ByteAdapter.java |   0
 .../adapter/impl/CharacterAdapter.java        |   0
 .../adapter/impl/DoubleAdapter.java           |   0
 .../adapter/impl/FloatAdapter.java            |   0
 .../adapter/impl/GuildChannelAdapter.java     |   0
 .../impl/GuildMessageChannelAdapter.java      |   0
 .../adapter/impl/IntegerAdapter.java          |   0
 .../dispatching/adapter/impl/LongAdapter.java |   0
 .../adapter/impl/MemberAdapter.java           |   0
 .../adapter/impl/NewsChannelAdapter.java      |   0
 .../dispatching/adapter/impl/RoleAdapter.java |   0
 .../adapter/impl/ShortAdapter.java            |   0
 .../adapter/impl/StageChannelAdapter.java     |   0
 .../adapter/impl/TextChannelAdapter.java      |   0
 .../adapter/impl/ThreadChannelAdapter.java    |   0
 .../dispatching/adapter/impl/UserAdapter.java |   0
 .../adapter/impl/VoiceChannelAdapter.java     |   0
 .../adapter/impl/package-info.java            |   0
 .../adapter/internal/TypeAdapters.java        |   0
 .../dispatching/adapter/package-info.java     |   0
 .../context/InvocationContext.java            |   0
 .../dispatching/context/KeyValueStore.java    |   0
 .../commands/dispatching/events/Event.java    |   0
 .../events/ModalReplyableEvent.java           |   0
 .../dispatching/events/ReplyableEvent.java    |   4 +-
 .../interactions/AutoCompleteEvent.java       |   5 +-
 .../events/interactions/CommandEvent.java     |   0
 .../events/interactions/ComponentEvent.java   |   0
 .../events/interactions/ModalEvent.java       |   0
 .../events/interactions/package-info.java     |   0
 .../dispatching/events/package-info.java      |   0
 .../expiration/ExpirationStrategy.java        |   0
 .../handling/AutoCompleteHandler.java         |   0
 .../handling/ComponentHandler.java            |   0
 .../handling/DispatchingContext.java          |   0
 .../dispatching/handling/EventHandler.java    |   0
 .../dispatching/handling/ModalHandler.java    |   0
 .../command/ContextCommandHandler.java        |   0
 .../handling/command/SlashCommandHandler.java |   0
 .../handling/command/package-info.java        |   0
 .../dispatching/handling/package-info.java    |   0
 .../dispatching/middleware/Middleware.java    |   2 +-
 .../dispatching/middleware/Priority.java      |   2 +-
 .../middleware/impl/ConstraintMiddleware.java |   0
 .../middleware/impl/CooldownMiddleware.java   |   0
 .../impl/PermissionsMiddleware.java           |   4 +-
 .../middleware/impl/package-info.java         |   0
 .../middleware/internal/Middlewares.java      |   0
 .../dispatching/middleware/package-info.java  |   0
 .../commands/dispatching/package-info.java    |   0
 .../commands/dispatching/reply/Component.java |   0
 .../dispatching/reply/ComponentReply.java     |   0
 .../dispatching/reply/ConfigurableReply.java  |   7 +-
 .../dispatching/reply/MessageReply.java       |   0
 .../jda/commands/dispatching/reply/Reply.java |   0
 .../dispatching/reply/package-info.java       |   0
 .../dispatching/validation/Validator.java     |   0
 .../validation/impl/MaximumValidator.java     |   0
 .../validation/impl/MinimumValidator.java     |   0
 .../impl/NotPermissionValidator.java          |   0
 .../validation/impl/NotRoleValidator.java     |   0
 .../validation/impl/NotUserValidator.java     |   0
 .../validation/impl/PermissionValidator.java  |   0
 .../validation/impl/RoleValidator.java        |   0
 .../validation/impl/UserValidator.java        |   0
 .../validation/impl/package-info.java         |   0
 .../validation/internal/Validators.java       |   0
 .../dispatching/validation/package-info.java  |   0
 .../jda/commands/embeds/EmbedCache.java       |   6 +-
 .../jda/commands/embeds/EmbedDTO.java         |   0
 .../error/DefaultErrorMessageFactory.java     |   0
 .../embeds/error/ErrorMessageFactory.java     |   0
 .../embeds/error/JsonErrorMessageFactory.java |   0
 .../commands/embeds/error/package-info.java   |   0
 .../jda/commands/embeds/package-info.java     |   0
 .../jda/commands/internal/Helpers.java        |   0
 .../jda/commands/internal/JDAContext.java     |   0
 .../internal/register/CommandTree.java        |   0
 .../register/SlashCommandUpdater.java         |   0
 .../commands/internal/register/TreeNode.java  |   0
 .../kaktushose/jda/commands/package-info.java |   0
 .../DefaultPermissionsProvider.java           |   0
 .../permissions/PermissionsProvider.java      |   0
 .../commands/permissions/package-info.java    |   0
 .../scope/DefaultGuildScopeProvider.java      |   0
 .../commands/scope/GuildScopeProvider.java    |   0
 .../jda/commands/scope/package-info.java      |   0
 {src => jdac/src}/main/java/module-info.java  |   1 -
 .../src}/main/javadoc/doc-files/flowchart.png | Bin
 {src => jdac/src}/main/javadoc/overview.md    |   0
 .../src}/test/java/adapting/CustomType.java   |   0
 .../test/java/adapting/CustomTypeAdapter.java |   0
 .../adapting/TypeAdapterRegistryTest.java     |   0
 .../test/java/adapting/TypeAdapterTest.java   |   0
 .../adapting/mock/CacheRestActionMock.java    |   0
 .../test/java/adapting/mock/GuildMock.java    |   0
 .../java/adapting/mock/JDACommandsMock.java   |   0
 .../src}/test/java/adapting/mock/JDAMock.java |   0
 .../test/java/adapting/mock/MemberMock.java   |   0
 .../java/adapting/mock/RestActionMock.java    |   0
 .../test/java/adapting/mock/RoleMock.java     |   0
 .../SlashCommandInteractionEventMock.java     |   0
 .../mock/SlashCommandInteractionMock.java     |   0
 .../java/adapting/mock/TextChannelMock.java   |   0
 .../TypeAdapterRegistryTestController.java    |   0
 .../test/java/adapting/mock/UserMock.java     |   0
 .../CommandDefinitionTestController.java      |   0
 .../commands/SlashCommandDefinitionTest.java  |   0
 .../test/java/commands/UnsupportedType.java   |   0
 .../src}/test/java/dependency/Dependency.java |   0
 .../dependency/DependencyInjectorTest.java    |   0
 .../test/java/dependency/InjectableClass.java |   0
 .../test/java/dependency/ProducingClass.java  |   0
 .../java/dependency/WrongProducingClass.java  |   0
 .../parameters/OptionDataDefinitionTest.java  |   0
 .../parameters/ParameterTestController.java   |   0
 .../test/java/reply/CustomController.java     |   0
 .../test/java/reply/DefaultController.java    |   0
 .../src}/test/java/reply/ReplyConfigTest.java |   0
 pom.xml => pom.xml.old                        |   0
 settings.gradle.kts                           |   8 +
 213 files changed, 448 insertions(+), 17 deletions(-)
 create mode 100644 gradle/libs.versions.toml
 create mode 100644 gradle/wrapper/gradle-wrapper.jar
 create mode 100644 gradle/wrapper/gradle-wrapper.properties
 create mode 100755 gradlew
 create mode 100644 gradlew.bat
 create mode 100644 jdac/build.gradle.kts
 rename {src => jdac/src}/examples/BanCommand.java (100%)
 rename {src => jdac/src}/examples/CookieClicker.java (100%)
 rename {src => jdac/src}/examples/Main.java (100%)
 rename {src => jdac/src}/examples/embeds.json (100%)
 rename {src => jdac/src}/examples/scope/PremiumCommand.java (100%)
 rename {src => jdac/src}/examples/scope/PremiumGuildsProvider.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/JDACommands.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/JDACommandsBuilder.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/annotations/Implementation.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/annotations/Inject.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/annotations/Produces.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/annotations/constraints/Constraint.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/annotations/constraints/Max.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/annotations/constraints/Min.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/annotations/constraints/NotPerm.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/annotations/constraints/NotRole.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/annotations/constraints/NotUser.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/annotations/constraints/Perm.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/annotations/constraints/Role.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/annotations/constraints/User.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/annotations/constraints/package-info.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/annotations/interactions/AutoComplete.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Button.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Choices.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/annotations/interactions/CommandScope.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/annotations/interactions/ContextCommand.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Cooldown.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/annotations/interactions/EntitySelectMenu.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Interaction.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Modal.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Optional.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Param.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Permissions.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/annotations/interactions/ReplyConfig.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/annotations/interactions/SelectOption.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/annotations/interactions/SlashCommand.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/annotations/interactions/StringSelectMenu.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/annotations/interactions/TextInput.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/annotations/interactions/package-info.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/annotations/internal/SelectOptionContainer.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/annotations/internal/package-info.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/annotations/package-info.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/definitions/Definition.java (97%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/definitions/description/ClassDescription.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/definitions/description/ClassFinder.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/definitions/description/Description.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/definitions/description/Descriptor.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/definitions/description/Invoker.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/definitions/description/MethodDescription.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/definitions/description/ParameterDescription.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/definitions/description/package-info.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/definitions/description/reflective/ReflectiveClassFinder.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/definitions/description/reflective/ReflectiveDescriptor.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/definitions/description/reflective/package-info.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/definitions/features/CustomIdJDAEntity.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/definitions/features/JDAEntity.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/definitions/features/internal/Invokable.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/definitions/features/package-info.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/definitions/interactions/AutoCompleteDefinition.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/definitions/interactions/CustomId.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/definitions/interactions/InteractionDefinition.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/definitions/interactions/InteractionRegistry.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/definitions/interactions/MethodBuildContext.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/definitions/interactions/ModalDefinition.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/CommandDefinition.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/ContextCommandDefinition.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/OptionDataDefinition.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/SlashCommandDefinition.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/package-info.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/ButtonDefinition.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/ComponentDefinition.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/menu/EntitySelectMenuDefinition.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/menu/SelectMenuDefinition.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/menu/StringSelectMenuDefinition.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/menu/package-info.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/package-info.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/definitions/interactions/package-info.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/dependency/DefaultDependencyInjector.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/dependency/DependencyInjector.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/dependency/package-info.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/dispatching/JDAEventListener.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/dispatching/Runtime.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/TypeAdapter.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/AudioChannelAdapter.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/BooleanAdapter.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/ByteAdapter.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/CharacterAdapter.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/DoubleAdapter.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/FloatAdapter.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/GuildChannelAdapter.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/GuildMessageChannelAdapter.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/IntegerAdapter.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/LongAdapter.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/MemberAdapter.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/NewsChannelAdapter.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/RoleAdapter.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/ShortAdapter.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/StageChannelAdapter.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/TextChannelAdapter.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/ThreadChannelAdapter.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/UserAdapter.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/VoiceChannelAdapter.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/package-info.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/internal/TypeAdapters.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/package-info.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/dispatching/context/InvocationContext.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/dispatching/context/KeyValueStore.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/dispatching/events/Event.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/dispatching/events/ModalReplyableEvent.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/dispatching/events/ReplyableEvent.java (98%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/dispatching/events/interactions/AutoCompleteEvent.java (98%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/dispatching/events/interactions/CommandEvent.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/dispatching/events/interactions/ComponentEvent.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/dispatching/events/interactions/ModalEvent.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/dispatching/events/interactions/package-info.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/dispatching/events/package-info.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/dispatching/expiration/ExpirationStrategy.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/dispatching/handling/AutoCompleteHandler.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/dispatching/handling/ComponentHandler.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/dispatching/handling/DispatchingContext.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/dispatching/handling/EventHandler.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/dispatching/handling/ModalHandler.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/dispatching/handling/command/ContextCommandHandler.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/dispatching/handling/command/SlashCommandHandler.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/dispatching/handling/command/package-info.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/dispatching/handling/package-info.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/Middleware.java (92%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/Priority.java (86%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/ConstraintMiddleware.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/CooldownMiddleware.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/PermissionsMiddleware.java (92%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/package-info.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/internal/Middlewares.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/package-info.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/dispatching/package-info.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/dispatching/reply/Component.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/dispatching/reply/ComponentReply.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/dispatching/reply/ConfigurableReply.java (94%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/dispatching/reply/MessageReply.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/dispatching/reply/Reply.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/dispatching/reply/package-info.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/dispatching/validation/Validator.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/MaximumValidator.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/MinimumValidator.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/NotPermissionValidator.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/NotRoleValidator.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/NotUserValidator.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/PermissionValidator.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/RoleValidator.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/UserValidator.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/package-info.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/dispatching/validation/internal/Validators.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/dispatching/validation/package-info.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/embeds/EmbedCache.java (96%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/embeds/EmbedDTO.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/embeds/error/DefaultErrorMessageFactory.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/embeds/error/ErrorMessageFactory.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/embeds/error/JsonErrorMessageFactory.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/embeds/error/package-info.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/embeds/package-info.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/internal/Helpers.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/internal/JDAContext.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/internal/register/CommandTree.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/internal/register/SlashCommandUpdater.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/internal/register/TreeNode.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/package-info.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/permissions/DefaultPermissionsProvider.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/permissions/PermissionsProvider.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/permissions/package-info.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/scope/DefaultGuildScopeProvider.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/scope/GuildScopeProvider.java (100%)
 rename {src => jdac/src}/main/java/com/github/kaktushose/jda/commands/scope/package-info.java (100%)
 rename {src => jdac/src}/main/java/module-info.java (99%)
 rename {src => jdac/src}/main/javadoc/doc-files/flowchart.png (100%)
 rename {src => jdac/src}/main/javadoc/overview.md (100%)
 rename {src => jdac/src}/test/java/adapting/CustomType.java (100%)
 rename {src => jdac/src}/test/java/adapting/CustomTypeAdapter.java (100%)
 rename {src => jdac/src}/test/java/adapting/TypeAdapterRegistryTest.java (100%)
 rename {src => jdac/src}/test/java/adapting/TypeAdapterTest.java (100%)
 rename {src => jdac/src}/test/java/adapting/mock/CacheRestActionMock.java (100%)
 rename {src => jdac/src}/test/java/adapting/mock/GuildMock.java (100%)
 rename {src => jdac/src}/test/java/adapting/mock/JDACommandsMock.java (100%)
 rename {src => jdac/src}/test/java/adapting/mock/JDAMock.java (100%)
 rename {src => jdac/src}/test/java/adapting/mock/MemberMock.java (100%)
 rename {src => jdac/src}/test/java/adapting/mock/RestActionMock.java (100%)
 rename {src => jdac/src}/test/java/adapting/mock/RoleMock.java (100%)
 rename {src => jdac/src}/test/java/adapting/mock/SlashCommandInteractionEventMock.java (100%)
 rename {src => jdac/src}/test/java/adapting/mock/SlashCommandInteractionMock.java (100%)
 rename {src => jdac/src}/test/java/adapting/mock/TextChannelMock.java (100%)
 rename {src => jdac/src}/test/java/adapting/mock/TypeAdapterRegistryTestController.java (100%)
 rename {src => jdac/src}/test/java/adapting/mock/UserMock.java (100%)
 rename {src => jdac/src}/test/java/commands/CommandDefinitionTestController.java (100%)
 rename {src => jdac/src}/test/java/commands/SlashCommandDefinitionTest.java (100%)
 rename {src => jdac/src}/test/java/commands/UnsupportedType.java (100%)
 rename {src => jdac/src}/test/java/dependency/Dependency.java (100%)
 rename {src => jdac/src}/test/java/dependency/DependencyInjectorTest.java (100%)
 rename {src => jdac/src}/test/java/dependency/InjectableClass.java (100%)
 rename {src => jdac/src}/test/java/dependency/ProducingClass.java (100%)
 rename {src => jdac/src}/test/java/dependency/WrongProducingClass.java (100%)
 rename {src => jdac/src}/test/java/parameters/OptionDataDefinitionTest.java (100%)
 rename {src => jdac/src}/test/java/parameters/ParameterTestController.java (100%)
 rename {src => jdac/src}/test/java/reply/CustomController.java (100%)
 rename {src => jdac/src}/test/java/reply/DefaultController.java (100%)
 rename {src => jdac/src}/test/java/reply/ReplyConfigTest.java (100%)
 rename pom.xml => pom.xml.old (100%)
 create mode 100644 settings.gradle.kts

diff --git a/.gitignore b/.gitignore
index d7bd29be3..55045128b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,6 @@ src/main/java/testing
 src/main/resources
 /logs
 .direnv
+
+**/build/
+.gradle/
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
new file mode 100644
index 000000000..e69cbd21f
--- /dev/null
+++ b/gradle/libs.versions.toml
@@ -0,0 +1,20 @@
+# This file was generated by the Gradle 'init' task.
+# https://docs.gradle.org/current/userguide/platforms.html#sub::toml-dependencies-format
+
+[versions]
+com-google-code-gson-gson = "2.10.1"
+net-dv8tion-jda = "5.2.2"
+org-jetbrains-annotations = "24.0.1"
+org-junit-jupiter-junit-jupiter-api = "5.9.2"
+org-junit-jupiter-junit-jupiter-engine = "5.9.2"
+org-reflections-reflections = "0.10.2"
+org-slf4j-slf4j-api = "2.0.5"
+
+[libraries]
+com-google-code-gson-gson = { module = "com.google.code.gson:gson", version.ref = "com-google-code-gson-gson" }
+net-dv8tion-jda = { module = "net.dv8tion:JDA", version.ref = "net-dv8tion-jda" }
+org-jetbrains-annotations = { module = "org.jetbrains:annotations", version.ref = "org-jetbrains-annotations" }
+org-junit-jupiter-junit-jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "org-junit-jupiter-junit-jupiter-api" }
+org-junit-jupiter-junit-jupiter-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "org-junit-jupiter-junit-jupiter-engine" }
+org-reflections-reflections = { module = "org.reflections:reflections", version.ref = "org-reflections-reflections" }
+org-slf4j-slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "org-slf4j-slf4j-api" }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000000000000000000000000000000000000..a4b76b9530d66f5e68d973ea569d8e19de379189
GIT binary patch
literal 43583
zcma&N1CXTcmMvW9vTb(Rwr$&4wr$(C?dmSu>@vG-+vuvg^_??!{yS%8zW-#zn-LkA
z5&1^$^{lnmUON?}LBF8_K|(?T0Ra(xUH{($5eN!MR#ZihR#HxkUPe+_R8Cn`RRs(P
z_^*#_XlXmGv7!4;*Y%p4nw?{bNp@UZHv1?Um8r6)Fei3p@ClJn0ECfg1hkeuUU@Or
zDaPa;U3fE=3L}DooL;8f;P0ipPt0Z~9P0)lbStMS)ag54=uL9ia-Lm3nh|@(Y?B`;
zx_#arJIpXH!U{fbCbI^17}6Ri*H<>OLR%c|^mh8+)*h~K8Z<V--Q23O4&HBVn~<)q
zmUaP7+TjluBM%#s1Ki#^GurGElkc7{cc6Skz+1nDVk%wAAQYx1^*wA%KSY>!9)DPf
zR2h?lbDZQ`p9P;&DQ4F0sur@TMa!Y}S8irn(%d-gi0*WxxCSk*A?3lGh=gcYN?FGl
z7D=Js!i~0=u3rox^e<cs4tSN~YA?c-d185$YFNA$Eq1&U{wh#b^OveuKoBPy0oYZ4
zAY2?B=x8yX9}pVM=cLrvugywt!e@Y3lH)i?7fvT*a`O;c)CJQ>O3i@$0=n{K1lPNU
zwmfjRVmLOCRfe=seV&P*1Iq=^i`502keY8Uy-WNPwVNNtJFx?IwA<BCEY82WDKJP<
zB^CxjFxi=mg*OyI?K3GoDfk;?-K<Z#JoxhYNeEUf896)l%7gL``44}zn)7|Rf;)SC
z_EfJr4I+3i(GiHN`R+vHqf}1wXtH?65<wKlxV1BU(#3XgtH<$Fir3S(7QeRA3)u89
zID&66K{&mq$DsB}s&o?H60{cskfh*hvn8hQW#~Q!qM04QtZvx3JEpqeKWE6|+OZW=
z(LB7}flr|t7va%>yR<KG!FYzS$bs7qXcpM&wV@~>PZo2<wCq%CszVO$mosTTuv*Mz
zOLoi?e^7B~xS22~QW8Rmnt{(AtL<HGi<_P9`0pH;3)@S9Eg`gt2X<om7C^q}pKX|*
zTy3X{nOr-xyt4=Qx1IjrzGb!_SyAv^SZcf;air&-;Ua+)5k0z=#R7@UW%)3oEjGA|
zZ#DE3px@h1k7w%|4rVIO=0Aid2A%?nBZrupg^_z5J-$$YKeDZ&q8+k7zccb<dc4D;
zz}+UYkl_eUNL3PW+reZ6UUB}=sHp~$z%Q}gZ-#ow+ffQIj|A3`B9LO*6%t@)0PV!x
ziJ=9fw_>Wo1+S(xF37LJZ~%i)kpFQ3Fw=mXfd@>%+)RpYQLnr}B~~zoof(JVm^^&f
zxKV^+3D3$A1G;qh4gPVjhrC8e(VYUHv#dy^)(RoUFM?o%W-EHxufuWf(l*@-l+7vt
z=l`qmR56K~F|v<^Pd*p~1_y^P0P^aPC##d8+HqX4IR1gu+7w#~TBFphJxF)T$2WEa
zxa?H&6=Qe7d(#tha?_1uQys2KtHQ{)Qco)qwGjrdNL7thd^G5i8Os)CHqc>iOidS}
z%nFEDdm=GXBw=yXe1W-ShHHFb?Cc70+$W~z_+}nAoHFYI1MV1wZegw*0y^tC*s%3h
zhD3tN8b=Gv&rj}!SUM6|ajSPp*58KR7MPpI{oAJCtY~JECm)*m_x>AZEu>DFgUcby
z1Qaw8lU4jZpQ_$;*7RME+gq1Ky<fW-rh4ehZ;%u960Gt5OF)<y$00S=6tVE=%Pt~(
z!&BP&2I%`@>SGG#Wql>aL~k9tLrSO()LWn*q&YxHE<sT^`N@Q|)S3y<ZACaLXO56z
zncP$~M5K!npWqz?)C50MMw=XqFtDO!3JHI*t-^8Ga&lGPHX2F0pIGdZ3w5ewE+{kf
z-&Ygi?@-h(ADD|ljIBw%VHHf1xuQ~}IeIQ5JqlA4#*Nlvd`IfDYzFa?PB=RCcFpZ4
z|HFmPZM=;^DQ_z<IPz$$+yG(H4803QQAA7vQF7;_gv|AD1bH*R-CP3f<<utDpH)Ht
zI@{uO12adp{;132YoKPx?C9{&;MtHdHb*0F0;Z~D42}#*l+WD2u?r>uzmwd1?aAtI
zBJ>P=&$=l1efe1CDU;`Fd+_;&wI07?V0aAIgc(<VS*?#8Zt!w88FJrjasA1!6>!{a
z0Jg6Y=inXc3^n!U0Atk`iCFIQooHqcWhO(qrieUOW8X(x?(RD}iYDLMjSwffH2~tB
z)oDgNBLB^AJBM1M^c5HdRx6fBfka`(LD-qrlh5jqH~);#nw|iyp)()xVYak3;Ybik
z0j`(+69aK*B>)e_p%=wu8XC&9e{AO4c~O1U`5X9}?0mrd*m$_EUek{R?DNSh(=br#
z#Q61gBzEpmy`$pA<eVn3dnmk^xq`=o2)~2c0ywsuTQsC?1WZZehsJYfK@LQ>*6!87
zSDD+=@fTY7<4A?GLqpA?Pb2z$pbCc4B4zL{BeZ?F-8`s$?>*lXXtn*NC61>|*w7J*
z$?!iB{6R-0=KFmyp1nnEmLsA-H0a6l+1uaH^g%c(p{iT&YFrbQ$&PRb8Up#X3@Zsk
zD^^&LK~111%cqlP%!_gFNa^dTYT?rhkGl}5=fL{a`UViaXWI$k-UcHJwmaH1s=S$4
z%4)PdWJX;hh5UoK?6aWoyLxX&NhNRqKam7tcOkLh{%j3K^4Mgx1@i|Pi&}<^5>hs5
zm8?uOS>%)NzT(%PjVPGa?X%`N2TQCKbeH2l;cTnHiHppPSJ<7y-yEIiC!P*ikl&!B
z%+?>VttCOQM@ShFguHVjxX^?mHX^hSaO_;pnyh^v9EumqSZTi+#f&_Vaija0Q-e*|
z7ulQj6Fs*bbmsWp{`auM04gGwsYYdNNZcg|ph0OgD>7O}Asn7^<IivRZw`Wa$`V6)
zgX@^QL9j}-Od{q5<J*k0+1U=R5+PCYj(U}4VpX+BjfI~+dttS?HJ6uZSGH#H-twTo
zaptG40+PAc$fs*zLFkOfGfc+xGs<T?rLGIA%SU7c%jh!E1SNN~*-`ccW8wo4gv2Sj
zhify^C(ygi)uGwqXDLqVbH>Z=eI>`$2*v78;sj-}oMoEj&@)9+ycEOo92xSyY344^
z11Hb8^kdOvbf^GNAK++bYioknrpdN>+u8R?JxG=!2Kd9r=YWCOJYXYuM0cOq^FhEd
zBg2puKy__7VT3-r*dG4c62Wgxi52EMCQ`bKgf*#*ou(D4-ZN$+m<X+=`m<r!lO%3T
zMp}MJd(WDoQ2&6(LClZxpv<vZPPM3Ngkye2VhB=i|B12g5ouw(%`gbWtRq8~sU|o*
z$kQ8Jb~6&{ak;r$7@?#t*q9RfAOj=^uAf1z5Y8`N%M`oM@?!~VqN{g%-u$XR1u1Im
zGE&AzFpIcER(5jtCPR%RZ)!+|*rU~jZBiOKdqYjO(%yK3Lz;{##(@QEVo>g&7$u!!
z-^<eVk1WtrWdvAzoBMHoB$s2RXJCv}%muyVFFJ``?>+Z%;-3IDwqZ|K=ah85OLwkO
zKxNBh+4QHh)u9D?MFtpbl)<T1$eOrb4-+U|WDC2BesgFRlgt`klbeQ^1S`7`r+uZ8
zH&U=geA}Si;CUcKvBA&^@<o1GQ7`{1Y(cCHZv|73JIJOvVwLOMZP%Q|)y@^j2e<+z
zWVo=#FL!4XNKS~-_1`gw*qi$0j6P7ym_LTvG>us}9+V!D%w9jfAMYEb>%$A;u)rrI
zuBudh;5PN}_6J_}l55P3l_)&RMlH{m!)ai-i$g)&*M`eN$XQMw{v^r@-125^RRCF0
z^2>|DxhQw(mtNEI2Kj(;<s2pnue6O@?^QaAp;Ze6z9nX*w}4h7342+0lU$@;Knnve
zqqY2Ci=`)@>KblC7x=JlK$@78`O~>V!`|1Lm-^JR$-5pUANAnb(5}B}JGjBsliK4&
zk6y(;$e&h)lh2)L=bvZKbvh@>vLlreBdH8No2>$#%_Wp1U0N7Ank!6$dFSi#xzh|(
zRi{U<eziQYNZ-=4ReK3@^LFvNQI~(Pdvp+X@J@g#bd~m0wFc+sW3Xf5tyA3xKp;T3
zy14<o-`F}$ET-DQ;B;yNy?d>w%-4W!{IXZ)fWx@XX6;&(m_F%c6~X8hx=BN1&q}*(
zoaNjWabE{oUPb!Bt$eyd#$5j9rItB-h*5JiNi(v^e|XKAj*8(k<5-2$&ZBR5fF|JA
z9&m4fbzNQnAU}r8ab>fFV%J0z5awe#UZ|bz?Ur)U9bCIKWEzi2%A+5CLqh?}K4JHi
z4vtM;+u<SJ)DEVF_yZnTw01M`(s#^BNx+c|MQ6ogb50Jjul0L;!#OmrYCs)iE)7(t
z?%I~O!zVNt#Bf3#O2WXsGz!B}&s@MfyDeaoqqf=GELN3g$+DA`&&GKy(`Ya~A@6vK
zn|WZ-+tB`DH^+SjI&K3KekF%-QIP%R{F)inWc~@cEO-=3Or<lm9g9}|`|ky#v{5*;
zKA5d<ecC{<o9p<U4UUK$m|+q#@(>PsVz{Lfr;78W78gC;z*yTch~4YkLr&m-7%-xc
ztw6Mh2<b07B|^BQBjvq{FXx?kyJ);`+G*=&9PMD`1uf<{+pNnnsIQx~kaB?*5<-7a
zqY)GyF_w$>d>_iO<o;tRi5=dcnU&wcur@4T5Z=-$xFUEsp-yX${|jSF|HMDPq3?MS
zw;p9zjR`yYJOfJZsK~C-S=JQ?nX{z_y@06JFIpheAo-rOG|5&Gxv)%95gpu@ESfi|
z7Auc&hjVL;&81Pc#L`^d9gJb`wEtLVH8q|h{>*$Rd8(-Cr1_V8EO1f*^@wRoSozS)
zy1UoC@pruAaC8Z_7~_w4Q6n*&B0AjOmMWa;s<dwKr_&w<X$Z*rmLmKUI3S>Iav&gu
z|J5&|{=a@vR!~k-OjKEgPFCzcJ>#A1uL&7xTDn;{X<DkOU(-L87#5hf4{m?aj!I6-
zPEt$K07IXK8mI0TYf-jhke2QjQw3v?qN5h0-#Fel0)Krq1f)#^AFsfd|K$I={`Xs9
z{JIr8M>BdeM}V=l3B8fE1--DHjSaxoSjNKEM9|U9#m2<eS=8Og#NOG$&X&%|8sOyg
zpZ6&%KPd&uh?v{hRMVvQjUL}gY3)Mk3{XQXF{><3>n{Iuo`r3UZp;>GkT2YBNAh|b
z^jTq-hJp(ebZh#Lk8hVBP%qXwv-@vbvoREX$TqRGTgEi$%_F9tZES@z8Bx}$#5eeG
zk^UsLBH{bc2VBW)*EdS({yw=?qmevwi?BL6*=12k9zM5gJv1>y#ML4!)iiPzVaH9%
zgSImetD@dam~e>{LvVh!phhzpW+iFvWpGT#CVE5TQ40n%F|p(sP5mXxna+Ev7PDwA
zamaV4m*^~*xV+&p;W749xhb_X=$|LD;FHuB&JL5?*Y2-oIT(wYY2;73<^#46S~Gx|
z^cez%V7x$81}UWqS13Gz80379Rj;6~WdiXWOSsdmzY39L;Hg3MH43o*y8ib<ko|2T
z<o~B%-$Y4Q9z_t97c`{g0veSfFt63Osbpe2Osn@<=nrAVk_JfMGt&lMGw9leshc#5
z*hkn0u>NBBH`(av4|u;YPq%{R;IuYow<+GEsf@R?=@tT@!}?#>zIIn0CoyV!hq3mw
zHj>OOjfJM3F{RG#6ujzo?y32m^tgSXf@v=J$ELdJ+=5j|=F-~hP$G&}tDZsZE?5rX
ztGj`!S>)CFmdkccxM9eGIcGnS2AfK#gXwj%esuIBNJQP1WV~b~+D7PJTmWGTSDrR`
zEAu4B8l>NPuhsk5a`rReSya2nfV<T&F{)-N{)9$`9a!^D!-03RDN<TPH!aW46TC4L
z>1EK01+G!x8aBdTs3Io$u5!6n6KX%uv@DxAp3F@{4UYg4SWJtQ-W~0MDb|j-$lwVn
znAm*Pl!?Ps&3wO=R115RWKb*JKoexo*)uhhHBncEDMSVa_PyA>k{Zm2(wMQ(5NM3#
z)jkza|GoWEQo4^s*wE(gHz?Xsg4`}HUAcs42cM1-qq_=+=!Gk^y710j=66(cSWqUe
zklbm8+zB_<cF$~mH3zum`PN7rn^cr1XvcjzxFO{ms_482AyMFYi+#o7!*vecrNhft
z48z<2q#fIw=ce!MXuptfT4+M8FP&|QfB3H@2)dceSR<*e5@hq<#7<$5tC^!RO8Zi<
zd_Wl!>syQv5A2rj!Vbw8;|$@C!vfNmNV!yJ<MblqN@23-5g1<aeoul%Um5K((_QY}
ze%_@BuNzay69}2PhmC<;m}2=FevDzrp!V!u4u|#h@B=rfKt+v!U`0k7>IWDQ>{+2x
zKjuFX`~~HKG~^6h5FntRpnnHt=D&rq0>IJ9#F0eM)Y-)GpRjiN7gkA8wvnG#K=q{q
z9dBn8_~wm4J<3J_vl|9H{7q6u2A!cW{bp#r*-f{gOV^e=8S{nc1DxMHFwuM$;aVI^
zz6A*}m8N-&x8;aunp1w7_vtB*pa+OYBw=TMc6Q<xVqo{NJ3h9-a)s5XuYMqZ=Y{7{
z$O63J`)FM-y*mko#!-UBa!3~eYtX1hjRQY2jMxAx=q5uKNm#uaKIak>K=mbA-|Cf*
zvyh8D4LRJImooUaSb7t*fVfih<97Gf@VE0|z>NcBwBQze);Rh!k3K_sfunToZY;f2
z^HmC4KjHRVg+eKYj;PRN^|E0>Gj_zagfRbrki68I^#~6-HaHg3BUW%<xsJq4AotN+
zH6twFV=)FlAbs*F6vGws^==x5Tl0AIbcP{&2yxB=)*u+bvK^L6$Vp}U2{9nj{bK~d
zee7tC)@DR<dI`D%cA(%7M9Ui3a)^iG?m=oJO0E^``<|5il2sf1fZHvy=D@e0<I)<l
zI!|d{`X3u}lz2(4Vn>+clM1<yhZZgPANro5CwhUb>xQEdPYt_g<2K+z!$>*$9nQ>;
zf9Bei{?zY^-e{q_*|W#2rJG`2fy@{%6u0i_VEWTq$*(ZN37|8lFFFt)nCG({r!q#9
z5VK_kkS<W$zJN%xs9<lngf<utn=i|I;bCdr-Lr<EzK)tkE-pYh-fc0wqKz?&U8TTN
zh_eAdl<>J3?zOH)OezMT{!YkCuSSn!<oaxO4?NS?VufjhPn>K#-Rhl$uUM(bq*jY?
zi1xbMVthJ`E>d>(f3)~fozjg^@eheMF6<)I`oeJYx4*+M&%c9VArn(OM-wp%M<-`x
z7sLP1&3^%Nld9Dhm@$3f2}87!quhI<BVn6Upp<cc;cU|)&2W%nk!Ak8tXK8aT!m*5
z^9zmeeS|PCG$hgM&Uh}0wp+#$jK3YCwOT&nx$??=a@_oQemQ~hS6nx6fB5r~bFSPp
z`alXuTYys4S5dCK)KDGR@7`I-JV^ewQ_BGM^o>@nwd@3~fZl_3LYW-B?Ia>ui`ELg
z&Qfe!7<FViITCBP{rA>m6ze=mZ<W0bN&bq-0D3>`Ia9$z|ARSw|IdMpooY4YiPN8K
z4B(ts3p%<w%rbophph+BzYj>2i(Td=<hfIaF6Ll8+9!48Ti=xpXB{FgJbk;>tgEHX
z0UQ_>URBtG+-?0E;E7Ld^dyZ;jjw0}XZ(}-QzC6+NN=40oDb2^v!L1g9xRvE#@IBR
zO!b-2N7wVfLV;mhEaXQ9XAU+>=XVA6f&T4Z-@AX!leJ8obP^P^wP0aICND?~w&N<u
ztispy>ykJ#54x3_@r7IDMdRNy4Hh;h*!u(Ol(#0bJdwEo$5437-UBjQ+j=Ic>Q2z`
zJNDf0yO6@mr6y1#n3)s(W|$iE_i8r@Gd@!DWD<Q)gT}bxTg_YpJQ5s|m8}+B)KBN6
zYnlzh>qZ7J&~gAm1#~maIGJ<sH@F<m!Fuh_fvrMbcDJNJ5~Yg;LF}NFN}&Y&LL76S
zv)~8W2?_rx`P;4LB-=JqsI{I~4U8DnSSIHWU2rHf%vWsA2-d=78An8z4q|lvgQ2iB
zhUUI!H+|C+_qp(Tjzu5usOu}cEoivZK&XA==sh0cD|Eg7eERXx?KwHI=}A9S_rx8S
zd)VLh_s!Juqi^!0xv7jH)UdSkEY~N|;QMWvs;HN`dMsdK=Dw2mtAHHcK8_+kS%a_V
zGgeQoaMM>1sls^gxL9LLG_Nh<XXk<>U!pTGty!TbhzQnu)I*S^54U6Yu%ZeCg`R>Q
zhBv$n5j<?~h)Y%y=zErI?{tl!(JWSDXxco7X8WI-6K;9Z-h&~kIv?$!6<k(g(xee?
z53>0v%O_j{QYWG!R9W?5_b&67KB$t}&e2LdMvd(PxN6Ir!H4>PNlerpBL>Zvyy!yw
z-SOo8caEpDt(}|gKPBd$qND5#a5nju^O>V&;f890?yEOfkSG^HQVmEbM3Ugzu+UtH
zC(INPDdraBN?P%kE;*Ae%Wto&sgw(crfZ#Qy(<4nk;S|hD3j{IQRI6Yq|f^basLY;
z-HB&Je%Gg}Jt@={_C{L$!RM;$$|<j7k-g{75e!h)4SlFvEZ*AkqrJI;EWu$Zx+OwM
zm{5Yk>iD6vu#3w?v?*;&()uB|I-XqEKqZPS!reW9JkLewLb!70T7n`i!gNtb1%vN-
zySZj{8-1>6E%H&=V}LM#xmt`J3XQoaD|@XygXjdZ1+P77-=;=eYpoEQ01B@L*a(uW
zrZeZz?HJsw_4g0vhUgkg@VF8<-X$B8pOqCuWAl28uB|@r`19DTUQQsb^pfqB6QtiT
z*`_UZ`fT}vtUY#%sq2{rchyfu*pCg;uec2$-$N_xgjZcoumE5vSI{+s@iLWoz^Mf;
zuI8kDP{!XY6OP~q5}%1&L}CtfH^N<3o4L@J@zg1-mt{9L`s^z$Vgb|mr{@WiwAqKg
zp#t-lhrU>F8o0s1q_9y`gQNf~Vb!F%70f}$>i7o4ho<sjDlFD=G`r<7$U?bJN+x5S
z@0&tQ=-XO1uDq(HCa$X)-l<u1!s<!W`30F78UcZaZKc8)G0af1Dsh%OOWh5)q+Q+n
zySBnE+3;9^#)U#Gq);&Cu=mtjNpsS~S0yjE@m4{Kq525G&cO_+b-_B$LeXWt_@XTq
z`)(;=^RDS@oh5dPjKyGAP?-Dbh507E5zZ=D2_C*6s^HXiA)B3f=65_M+rC&rMIUP6
zi4@u>$`uciNf=xgJ>&!gSt0g;M>*x4-`U)ysFW&Vs^Vk6m%?iuWU+o&m(2Jm26<Ea
z?or_^bK_`R)hBTfrBqA3Y^o7$K~Nzo)sh-vT%yWcc1I5wF1nkvk%!X_Vl_MK1IHC=
zt}Dt+sOmg0sH-?}kqNB|M_}ZXui7H;?;?xCCSIPSHh8@h^K8WU5X(!3W|>Y(3%TL;
zA7T)BP{WS!&xmxNw%J=$MPfn(9*^*TV;$JwRy8Zl*yUZi8jWYF>==j~&S|Xinsb%c
z2?B+kpet*muEW7@AzjBA^wAJBY8i|#C{WtO_or&Nj2{=6JTTX05}|H>N2B|Wf!*3_
z7hW*j6p3TvpghEc6-wufFiY!%-GvOx*bZrhZu+7?iSrZL5q9}igiF^*R3%DE4aCHZ
zqu>xS8LkW+Auv%z-<1Xs92u23R$nk@Pk}MU5!gT|c7vGlEA%G^2th&Q*zfg%-D^=f
z&J_}jskj|Q;73NP4<UD^T*M!yxMr=U!@&!rJfydk7CE7PGb<{)^=nM9Le#FQ=GkV~
z)_A$YPAn35??iNa@`g-wBX><4k*Y%pXPU2Thoqr+5uH1yEYM|VtBPW6lXaetokD0u
z9qVek6Q&wk)tFbQ8(^HGf3Wp16gKmr>G;#G(HRBx?F`9AIRboK+;OfHaLJ(P>IP0w
zyTbTkx_THEOs%Q&aPrxbZrJlio+hCC_HK<4%f3ZoSAyG7Dn`=X=&h@m*|UYO-4Hq0
z-Bq&+Ie!S##4A6OGoC~>ZW`Y5J)*ouaFl_e9GA*VSL!O_@xGiBw!AF}1{tB)z(w%c
zS1Hmrb9OC8>0a_$BzeiN?rkPLc9%&;1CZW*4}CDDNr2gcl_3z+WC15&H1Zc2{o~i)
z)LLW=WQ{?ricmC`G1GfJ0Yp4Dy~Ba;j6ZV4r{8xRs`13{dD!xXmr^Aga|C=iSmor%
z8hi|pTXH)5Yf&v~exp3o+sY4B^^b*eYkkCYl*T{*=-0HniSA_1F53eCb{x~1k3*`W
zr~};p1A`k{1DV9=UPnLDgz{aJH=-LQo<5%+Em!DNN252xwIf*wF_zS^!(XSm(9eoj
z=*dXG&n0>)_)N5<wxn0{TP0tnD=JAzVUcIUoR85Xt>oc6v!>-bd(2ragD8O=M|wGW
z!xJQS<)u70m&6OmrF0WSsr@I%T*c#Qo#Ha4d3COcX+9}hM5!7JIGF>7<~C(Ear^Sn
zm^ZFkV6~Ula6+8S?oOROOA6$C&q&dp`>oR-2Ym3(HT@O7Sd5c~+kjrmM)YmgPH*tL
zX+znN>`tv;5eOfX?h{AuX^LK~V#gPCu=)Tigtq9&?7Xh$qN|%A$?V*v=&-2F$zTUv
z`C#WyIrChS5|Kgm_GeudCFf;)!WH7FI60j^0o#65o6`w*S7R@)88n$1nrgU(oU0M9
zx+EuMkC>(4j1;m6N<sS-ys^qbJhGY7%0ZoC7dK=j7bGdau`J`{>oGqEkpJYJ?vc|B
zOlwT3<tNmX!mXZdsEW2s2`|?DC8;N?2tT*Lfq)F*|4vf>t&UgL!pX_P*6g36`ZXQ;
z9~Cv}ANFnJGp(;ZhS(@FT;3e)0)Kp;h^x;$*xZn*k0U6-&Fw<BqOnDKEdld8!Qk{Z
zjI1+R_ciEqL3CLOv$+J~YVpzIy`S&V{koIi$Lj}ZFEMN=!rL1?_EjSryIV+OBiiJ-
zIqT$oSMA>I=uOGaODdrsp-!K$Ac32^c{+FhI-HkYd5v=`PGsg%6I`4d9Jy)uW0y%)
zm&j^9WBAp*P8#kGJUhB!L?a%h$hJgQrx!6KCB_TRo%9{t0J7KW8!o1B!NC)VGLM5!
zpZy5Jc{`r{1e(jd%jsG7k%I+m#C<kI0i<ajCqQC!(pKlSsMl7M2N^mP%W`BGKb?hm
zBK`pddcg5+WhE#$46+K<Z!1CW-hZdo7hAw13ZUVqwW*}&ujL=eh{m~phuOy=JiBMN
z7FaCUn6boJ!M=6PtLN6%cveGkd12|1B{)kEYGTx#IiMN&re0`}NP-_{E-#FxOo3*P
zkAXSt{et292KfgGN`AR|C`p{MRpxF-I?+`ZY1Vsv>GS*BPA65ZVW~fLYw0dA-H_}O
zrkGFL&P1PG9p2(%Qi<evvBkNEkQkM%A>EWm6x;U-U&I#;Em$nx-_I^wtgw3xUPVVu
zqSuKnx&dIT-XT+T10p;yjo1Y)z(x1fb8Dzfn8e&#9yu?e%!_ptzGB|8GrCfu%p?(_
zQccdaaVK$5bz;*rnyK{_SQYM>;aES6Qs^lj9lEs6_J+%nIiuQC*fN;z8md>r_~Mfl
zU%p5Dt_YT>gQqfr@`cR!$NWr~+`CZb%dn;WtzrAOI>P_JtsB76<bUr7Lsb65vEd}g
z5JhMCmn#UeH#6Cew?bxogM)$x5ed{E)%2nWY5rb@Clvh$(JzQ#!CsQ(2I4QnhDDJ^
zYL%2bf8?`y)Ro=x{(dw<4^)(H^z7~3nfYFh-r7yBBb=l3V8dE-Dr&a%qs<OYcajo2
z(4Nw|k5_OQ@6zHmcIK%waj!yoZT(S1YlEFN?8-_lp9nf>PYe*<%H(y>qx-`Kq!X_;
z<{RpAqYhE=L1r*M<cT6p|4(5fVa-WIh|@AphR|cJ1`?N>)gNF3B8r(<%8mo*SR2hu
zccLRZwGARt)H<F*kMvg%oJV~29ud_q>lo1euqTyM>^!HK*!Q2P;4UYry<i)yWXzKa
zM^_qppY~vnIrhL_!;Z9msXMZTTwR{e`yH5t=HdD1Pni7?LqOpLoX}u5n5RfkGBvQ1
z@cdMeR4T6rp^S~>sje@;(<|$&%vQekbn|0Ruu_Io(w4#%p6ld2Yp7tlA`Y$cciThP
zKzNGIMPXX%&Ud0uQh!uQZz|FB`4KGD?3!ND?wQt6!n*f4EmCoJUh&b?;B{|lxs#F-
z31~HQ`SF4x$&v00@(P+j1pAaj5!s`)b2RDBp*PB=2IB>oBF!*6vwr7Dp%zpAx*dPr
zb@Zjq^XjN?O4QcZ*O+8>)|HlrR>oD*?WQl5ri3R#2?*W6iJ>>kH%KnnME&TT<gNU{
zn$Veg044#l=Z-&wsmEZhnw7IwT7Cd}hiZ%ke)-GzAR-Dt6)8Cb6>@Z<Y-SEE^OC5H
z=$M0HjdWR5p?n;s9OTXrEa1eGt}G;Eu)ifSop!$z#6V<>zrHS$Q%LC?n|e>V+D+8D
zYc4)QddFz7I8#}y#Wj6>4P%34dZH<AWj}HgE@5&D9Ra@o(Km_Gm}5Zb61p%9mDz1%
zya$Vd!_U~pDN*Y5%lo}-K~}4&F)rTjJ7uGyV@~kB-XNrIGRiB=UrNxJtX;JHb(EyQ
z{!R%v{vC7m|L3bx6lCRb7!mP~Is!r!q&OXpE5nKnH3@l({o}PrL`o>~OUDb?uP%-E
zwjXM(?Sg~1!|wI(RVu<h{6ESg9k500(D<HXwz52OGq(JEKS2CJR}8N&E-#%vhhaRN
zL#Q6%yUcel+!a#~g&e7w4$3s62d$Dv;SxCxhT}>xbu)-rH+O=igSho_pDCw(c6b=P
zKk4ATlB?bj9+HHlh<_!&z0rx13K3ZrAR8W)!@Y}o`?a*JJsD+twZIv`W)@Y?Amu_u
zz``@-e2X}27$i(2=9rvIu5uTUOVhzwu%mNazS|lZb&PT;XE2|B&W1>=B58#*!~D&)
zfVmJGg8UdP*fx(>Cj^?yS^zH#o-$Q-*$SnK(ZVFkw+er=>N^7!)FtP3y~Xxnu^nzY
zikgB>Nj0%;WOltWIob|}%lo?_C7<``a5hEkx&1ku$|)i>Rh6@3h*`slY=9U}(Ql_<
zaNG*J8vb&@zpdhAvv`?{=zDedJ23TD&Zg__snRAH4eh~^oawdYi6A3w8<<tS1{)`*
zH!u#2_lf&B)x2)tE$?4|aMAYUFZ{|Se7->Ozh@Kw)<E~4fKYaJ{OS+>#bdktM^GVb
zrG08?0bG?|NG+w^&JvD*7LAbjED{_Zkc`3H!My>0u5Q}m!+6VokMLXxl`Mkd=g&Xx
z-a>m*#G3SLlhbKB!)tnzfWOBV;u;ftU}S!NdD5+YtOjLg?X}dl>7m^gOpihrf1;PY
zvll&>dIuUGs{Q<Ww4SS<E23Sm*si$^C!!snD|AFym<+q$`*o0wokE?J{^g?f3>nd-
zwIR3oIrct8Va^Tm0t#(bJD7c$Z7DO9*7NnRZorrSm`b`cxz>OI<bVZt$VQ!oMxCu0
zbb7D5OIXV5Ynn@Y6)HLT=1`a=nh7{ee{vr<=$>C;jSE3DO8`hX955ui`s%||YQtt2
z5DNA&pG-V+4oI2s*x^>-$6J?p=I>C|9wZF8z;VjR??Icg?1w2v5Me+FgAeGGa8(3S
z4vg*$>zC-WIVZtJ7}o9{D-7d>zCe|z#<9>CFve-OPAYsneTb^JH!Enaza#j}^mXy1
z+ULn^10<XTm*l1Jg2Z;UvGEN!6Wq%I@OP4p{k`RNRKlKFWPt_of11^Gr%_Mg*mVP3
zm?)&3I719~aYcs)TY&q^$zmQ=xoC++VJH@~YG6>+rWLF6j2>Ya@@Kq?26>AqK{A_|
zQKb*~F1>sE*=d?A?W7N2j?L09_7n+H<SF8|SM#pTc9|9|rf1w*m4Y0Vdj643qA#D|
z!hJzb_-}IrrhkWr{zk_YC%(c-)UJl6Ma!mcbvj&~#yN-UhH?ZQ3TPq4hTVQ$(?eJ6
zNfJ_K+VJDBXN=l!7{2}lq?-$`fq|e&PEONfZDU<_SM+s2_3$vT_yqV<R&KG=K{zS}
zKQF$?mYsg%vV|E_E=a*SL!`7*AeN6GMVDXC59yPgi$F2!7&8e}EyHVLwCm{i%<pN!
zdc`SbZK}JQj7?6K&|261iHrsnVjdhxu_l_NKs&yy#;#^%8?Jlg`wcTlNZ3urUtEYd
zsFE!K0}Eg39)z+J6mLW)#Kn<ok4*6AAE=n*vh*;TpgGnnM|npykFpO|a0`4#SjP^b
z2<JG#Qk^#3FeFS`0eooK9|wEmCcvRKI*~6mamFTd^UW9Eg4!J4N9qz*C$3a#F;Sad
zi#o9LaqNG5TsiT<`SDtY^`)zkYx$(C5;&K9#(Zj}HolT_st~#C`VS8q%#q1)HN+hT
zz9IjVUdZNIp@;b88oR`~DvQL_zmsBy>Gi{VY;MoTGr_)G9)ot$p!-UY5zZ2Xtbm=t
z@dpPSGw<TLTZo~Zyx(+AKWvR~{L4S^5I;5+QT9bcQ-4cC{QnLfRBf&Pov~kv@`W6V
zA|h{EGx|7msvR1t`a-jF$JZ>gH=QtIcEulQNI>S-#ifbnO5EWkI;$A|pxJd885oM+
zGZ0_0gDvG8q2xebj+fbCHYfAXuZStH2j~|d^sBAzo46(K8n59+T6rzBwK)^rfPT+B
zyIFw)9YC-V^rhtK`!3jrhmW-sTmM+tPH+;nwjL#-SjQPUZ53L@A>y*rt(#M(qsiB2
zx6B)dI}6Wlsw%bJ8h|(lhkJVogQZA&n<jl%@&gd%^X|lsDQwDHEiKLCz}r`kC^h0t
z(!vYS%C)Ku?w$ti5R##9jSkNC#5)Juc{8XfEhczdGQy8yNrZL6+d0~%V=N|iF{V)E
zLT(gH!$j8Mf(1>{?Vgs6gNSXzuZpEyu*xySy8ro07QZ7Vk1!3tJphN_5V7qOiyK8p
z#@jcDD8nmtYi1^l8ml;AF<#IPK?!pqf9D4moYk>d99Im}Jtwj6c#+A;f)CQ*f-hZ<
z=p_T86jog%!p)D&5g9taSwYi&e<jP@@Q_fbXtVO&n9{e#)jg+D#~q=hoZ<9PIa)>P
z#JuEK%+NULWus;0w32-SYFku#i}d~+{Pkho&^{;RxzP&0!RCm3-9K6`>KZpnzS6?L
z^H^V*s!8<>x8bomvD%rh>Zp3>Db%kyin;qtl+jAv8Oo~1g~mqGAC&Qi_wy|xEt2iz
zWAJEfTV%cl2Cs<1L&DLRVVH05EDq`pH7Oh7sR<WSzBWU(MxAIA&4v~INVdLKA><BK
zwCgTxJU0mM{;1UV<^ZRk0SQNNN(;SRZsH7^EDWVUu%^mFfvW{m5jOQuQWSy`f586I
zTj}Z4e5WsvkNmBd`TJdfe=^>`NNkL%wi}8n>IXcO40hp+J+sC!W?!krJf!GJNE8uj
zg-y~Ns-<~D?yqbzVRB}G>0A^f0!^N7l=$m0OdZuqA<e9rzV|ixGyk9uS=Vov2_ECA
z^Sd0M$B)O&tv@%@UmTb%ngcl58ED9TyFp$y4JjFU+g+9EWUl?am<e#4uCGy9Tmt)z
z2Y|kWUahugFHsF<J6o!<?X(Ncsy&Wg9<QLPD}g-`PWGHWDY5P6;<Y+5J1vz2Z|PSy
zBN?Q^NkxnWq>OQq<EC8_d&#T2smn`YINd-HF@)Op)pBRHnx+Q|Hsv_BpWAPsT1>Lc
zX?AEGr1Ht+inZ-Qiwnl@Z0qukd__a!C*CKuGdy5#nD7VUBM^6OCpxCa2A(X;e0&V4
zM&WR8+wErQ7UIc6LY~Q9x%Sn*Tn>>P`^t&idaOEnOd(Ufw#>NoR^1QdhJ8s`h^|R_
zXX`c5*O~Xdvh%q;7L!_!ohf$NfEBmCde|#uVZvEo>OfEq%+Ns7&_f$OR9xsihRpBb
z+cjk8LyDm@U{YN>+r46?nn{7Gh(;WhFw6GAxtcKD+YWV?uge>;+q#Xx4!GpRkVZYu
zzsF}1)7$?%s9g9CH=Zs+B%M_)+~*j3L0&Q9u7!|+T`^O{xE6qvAP?XWv9_MrZKdo&
z%IyU)$Q95AB4!#hT!_dA>4e@zjOBD*Y=XjtMm)V|+IXzjuM;(l+8aA5#Kaz_$rR6!
zj>#&^DidYD$nUY(D$mH`9eb|dtV0b{S>H6FBfq>t5`;OxA4Nn{J(+XihF(stSch<f
zIn>e7$es&~N$epi&PDM_N`As;*9D^L==2Q7Z2zD+CiU(|+-kL*VG+&9!Yb3LgPy?A
zm<g7T4Wx!m(zMlVE_2jX$1$$5DcfL6>7Z&^qRG_JIxK7-FBzZI3Q<;{`DIxtc48k>
zc|0dmX;Z=W$+)qE)~`yn6MdoJ4co;%!`ddy+FV538Y)j(vg}5*k(WK)KWZ3WaOG!8
z!syGn=s{H$odtpqFrT#JGM*utN7B((abXnpDM6w56nhw}OY}0TiTG1#f*VFZr+^-g
zbP10`$LPq_;PvrA1XXlyx2uM^mrjTzX}w{yuLo-cOClE8MMk47T25G8M!9Z5ypOSV
zAJUBGEg5L2fY)ZGJb^E34R2z<C?_X1)4xsl9%Z|w&L9k!F(V>J?}Vf>{~gB!8=5Z)
z9y$>5c)=;o0HeHHSuE4U)#vG&KF|I%-cF6f$~pdYJWk_dD}iOA>iA$O$+4%@>JU08
zS`ep)$XLPJ+n0_i@PkF#ri6T8?ZeAot$6JIYHm&P6EB=BiaNY|aA$W0I+nz*zkz_z
zkEru!tj!QUffq%)8y0y`T&`fuus-1p>=^hnBiBqD^hXrPs`PY9tU3m0np~rISY09>
z`P3s=-kt_cYcxWd{de@}TwSqg<T-v~${38)1dqT{JCO5}Gk$$yZP*X!5)RaGFqqkZ
zeHhqUgXb37$91~LS-3Zi29CKKki0sBTh7unqEK$%FG?oo$Sp>*xVhp;E9zCsnXo6z
z?f&Sv^U7n4`xr=mXle94HzOdN!2kB~4=%)u&N!+2;z6UYKUDqi-s6AZ!haB;@&B`?
z_TRX0%@suz^TRdCb?!vNJYPY8L_}&07uySH9%W^Tc&1pia6y1q#?*Drf}GjGbPjBS
zbOPcUY#*$3sL2x4v_i*Y=N7E<UbOmi3K%)5<dOJui+{^+b*shA_w8&X4_Icv*!}kT
zW@BG{C%f{(K^kE?tjU`Led*kAj6wB_3f*UyIEV0T9TyMo4`NS;oA7Ec+71eFa;K|G
zCyaKKi1bvX9fTLQ+uAgF*@ZR8fB%|JlT8A-jK$7FMyxW>$mR}J%|GUI(>WEr+28+V
z%v5{#e!UF*6~G&%;l*q*$V?&r$Pp^sE^i-0$+RH3ERUUdQ0>rAq2(2QAbG}$y{de(
z>{qD~GGuO<V3ijl7+~xmS#nUvH{qF0*%7G(r|}BSXsu}HwrFbXWzcYJouIY*34axA
z(n@XsPrv%6;|GSbkH9Og>k559Y@%$?N^1ApVL_a704>8OD%8Y%8B;FCt%AoPu8*D1
zLB5X>b}Syz81pn;xnB}%0FnwazlWfUV<Vu@5P52pgIa+J{M)H4nAC<>)Z-~rZg6~b
z6!9J$EcE&sEbzcy?CI~=boWA&eeIa%z(7SE^qgVLz??1Vbc1*aRvc%Mri)AJaAG!p
z$X!_9Ds;Zz)f+;%s&d<S0a>RcJt2==P{^j3bf0M=nJd&xwUGlUFn?H=2W(*2I2Gdu
zv!gYCwM10aeus)`RIZSrCK=&oKaO_Ry~D1B5!y0R=%!i2*KfXGYX&gNv_u+n9wiR5
z*e$Zjju&ODRW3phN925%S(jL+bCHv6rZtc?!*`1<n2%>TyYXT6%Ju=|X;6D@lq$8T
zW{Y|e39ioPez(pBH%k)HzFITXHvnD6hw^lIoUMA;qAJ^CU?top1fo@s7xT13Fvn1H
z6JWa-6+FJF#x>~+A;D~;VDs2<i>6>^oH0EI`IYT2iagy23?nyJ==i{g4%HrAf1-*v
zK1)~@&(KkwR7TL}L(A@C_S0G;-GMDy=MJn2$FP5s<%wC)4jC5PXoxrQBFZ_k0P<n-
z??iM<JF!BTjD>{{s@<jPT1+pTPdk3<izB+}jAtjokIz)aPR$L&4%}45Et}?jz0w{(
zC4G}+Nu0D*w=ay`v91hMo+V&V8q(a!`~K-2<yR0H)sK+mcY?TAaSS8F<Q+!pSc;`*
z*c@5)+ZpT%-!K3O=Z0(hI8LH7KqK>sz+gX`-!=T8rcB(=7vW}^K6oLWMmp(rwDh}b
zwaGGd>yEy6fHv%jM$yJXo5oMAQ>c9j`**}F?MCry;T@47@r?&sKHgVe$MCqk#Z_3S
z1GZI~nOEN*P~+UaFGnj{{Jo@16`(qVNtbU>O0Hf57-P>x8Jikp=`s8xWs^dAJ9lCQ
z)GFm+=OV%AMVqVATtN@|vp61VVAHRn87}%PC^RAzJ%JngmZTasWBAWsoAqBU+8L8u
z4A&Pe?fmTm0?mK-BL9t+{y7o(7jm+RpOhL9Kn<D3v{}Wpv2i&ghEZe;t&DmOA_QYc
zM+NIUU}=*bkxOJsLKV3e^oGG8rufTpa8R~7Iki1y+fC(UT;;{l19@qfxO@0^!xMA?
z#|<YBZ6;vAb>Y#E&qu^}B6=K_dB}*VlSEiC9fn)+V=J;OnN)Ta5v66ic1rG+dGAJ1
z1%Zb_+!$=tQ~lxQrzv3x#CPb?CekEkA}0MYSgx$Jdd}q8+R=ma$|&1a#)TQ=l$1tQ
z=tL9&_^vJ)Pk}EDO-va`UCT1m#Uty1{v^A3P~83_#v^ozH}6*9mIjIr;t3Uv%@VeW
zGL6(CwCUp)Jq%G0bIG%?{_*Y#5IHf*5M@wPo6A{$Um++Co$wLC=J1aoG93&T7Ho}P
z=mGEPP7Gb<mBTnJH7dKM2CB)0*o-AW2E4i5R+rHU%4A2BTVwOqj4zmJqsb|5^*{DT
zv^HFARK6@^_1|vU{>voG!uD$k(H3A$Z))+i{Hy?QHdk>3xSBXR0j!11O^mEe9RH<y
zF3MI;^J1vHI9U>mw!pvzv?Ua~2_l2Yh~_!s1qS`|0~0)<BWX>YsbHSz8!mG)WiJE|
z2<APmuYD%tKwB@0u<C~CKyaC}XX{?mylzkDSuLMkAoj?zp*zFF7q515SrGD~s}ATn
z`Ded41yk>f($6TQtt6L_f~ApQYQKSb=`053LgrQq7G@98#igV>y#i==-nEjQ!XNu9
z<h*hnP2Pol+z>~;mE+gtj4IDDNQJ~JVk5Ux6&LCSFL!y=>79kE9=V}J7tD==Ga+IW
zX)r7>VZ9dY=V&}DR))xUoV!u(Z|%3ciQi_2jl}3=$Agc<a_3#EUXJj<z2jVv6VHGT
zV^v1FiRwA!kPmt}m$qdr&9#-6{QeZqtM3|tRl$sws3Gy`no`Kj@X-)O(^sv>(`RPb
z8kEBpvY>1FGQ9W$n>Cq=DIpski};nE)`p3IUw1Oz0|wxll^)4dq3;CCY@RyJgFgc#
zKouFh!`?Xuo{IMz^xi-h=StCis_M7y<P{h0$_I#EukRYag9%BMRXh|%Xl7C<>q$u)
z?XHvw*HP0VgR+KR6wI)jEMX|ssqYvSf*_3W8zVTQzD?3>H!#>InzpSO)@SC8q*ii-
z%%h}_#0{4JG;Jm`4zg};BPTGkYamx$Xo#O~lBirRY)q=5M45n{GCfV<Kqrcu9<z@R
zSE>7h9qwyu1NxOMoP4)jjZMxmT|IQQh0U7C$EbnMN<3)Kk?fFHYq$d|ICu>KbY_hO
zTZM+uKHe(cIZfEqyzyYSUBZa8;Fcut-GN!HSA9ius`lt<SmSV9vasBl&hE7ciOunD
z?%e1Hl-5B3e+<+8CD{j5U*D3h89nV<zn^0g+t=uRKgZiGu)3h;vu#^y`HqWe_=jGm
zW2p}*n<!QH%pQ2EV`&z|LD#BOpj0QS9R5#$q}3&-+@GL4F^wO-bcSo|J^I_{LATPF
z2$`fUCOO=XxYVD!<7Yz4te$d-_>NebF46ZX_BbZNU}}ZOm{M2&nAN<H$fJIKS=j8q
zwXlN!l^_4>L9@0qvih15(|`S~z}m&h!u4x~(%MAO$jHRWNfuxWF#B)E&g3ghSQ9|>
z(MFaLQj)NE0lowyjvg8z0#m6FIuKE9lDO~Glg}nSb7`~^&#(Lw{}GVOS>U)m8bF}x
zVjbXljBm<v)#bs=9p`s>34Cs-yM6TVusr+3kYFjr28STT3g056y3cH5Tmge~ASxBj
z%|yb>$eF;WgrcOZf569sDZOVwoo%8>XO>XQOX1OyN9I-SQgrm;U;+#3OI(zrWyow3
zk==|{<m8xZ#>lt2xrQ%FIXOTejR>;wv(Pb8u8}BUpx?yd(Abh<shPyABw|Ens8m6@
zIg($GO4)<g4x5icbki?U&2%56@tYd`zRs}Nk6R~4!AjVAihB3r8oDhQ8f)v^r}|(y
z4B&Q<ARRqYXKQGAeJa_KHe`)04jUO~B=%q#SUlU@pU?apz0v{Al@s`Cvzo)u;2>6?
zsoO3VYWkeLnF43&@*#MQ9-i-d0t*xN-UEyNKeyNMHw|A(k(_6QKO=nKMCxD(W(Yop
zsRQ)QeL4X3Lxp^L%wzi2-WVSsf61dqliPUM7srDB?Wm6Lzn0&{*}|IsKQW;02(Y&|
zaTKv|`U(pSzuvR6Rduu$wzK_W-Y-7>7s?G$)U}&uK;<>vU}^^ns@Z!p+9?St1s)dG
zK%y6xkPyyS1$~&6v{kl?Md6gwM|>mt6Upm>oa8RLD^8T{0?HC!Z>;(Bob7el(DV6x
zi`I)$&E&ngwFS@bi4^xFLAn`=fzTC;aimE^!cMI2n@Vo%Ae-ne`RF((&5y6xsjjAZ
zVguVoQ?Z9uk$2ON;ersE%PU*xGO@T*;j1BO5#TuZKEf(mB7|g7pcEA=nYJ{s3vlbg
zd4-DUlD{*6o%Gc^N!Nptgay>j6E5;3psI+C3Q!1ZIbeCubW%w4pq9)MSDyB{HLm|k
zxv-{$$A*pS@csolri$Ge<4VZ}e~78JOL-EVyrbxKra^d{?|NnPp86!q>t<&IP07?Z
z^>~IK^k#OEKgRH+LjllZXk7iA>2cfH6+(e&9ku5poo~6y{GC5>(bRK7hwjiurqAiZ
zg*DmtgY}v83IjE&AbiWgMyFbaRUPZ{lYiz$U^&Zt2YjG<%m((&_JUbZcfJ22(>bi5
z!J?<7AySj0JZ&<-qXX;mcV!f~>G=sB0KnjWca4}vrtunD^1TrpfeS^4dvFr!65knK
zZh`d;*VOkPs4*-9kL>$GP0`<?hW@{z#_gXtp%=2VbN+$~z+M($Vf(dl@)t-*82<$(
zHi{FrD1wO9L~*Rc0{A2WU%f?ar(T9V1JpQ?M0Q|&{UES|#Z~k2-mj@z)8Rw^(XeYc
zomT(B0EF!##4dQq_*NN<%Bo5)&+gCXSGZo`b>(M!j~B;#x?Ba<KDM~HJ!|Zzy=p2e
z8;av`GLw{_*RgO(W|UK-<iDeT!t_x1c=M3%wGk|fDk<e0lLe8-5ga6apKYJD`*a3G
zBl?Ps)hDb7X`7bW5S=IHr0Mm?fr|$zCf+gmZUrit$5n+)JZG>~&s6CopvO86oM?-?
zOw#dIRc;6A<R&%m3DDJhF+|tb*0Yw8mV{a-bf^E~gh66MdsMHkog<r9`fVIVE+h@O
zi)iM`rmA-Fs^c=>6T?B`Qp%^<<Dyu<%Kg0H=lq;E!p&UHzSpD1)q%^v)Y8yQkp>U5
z19x(ywSH$_N+Io!6;e?`tWaM$`=D<O;$E>b!gzx|lQ${DG!zb1Zl&|{kX0y6xvO1o
z220r<-oaS^^R2pEyY;=Qllqpmue|5yI~D|iI!IGt@iod{Opz@*ml^w2bNs)p`M(Io
z|E;;m*Xpjd9l)4G#KaWfV(t8YUn@A;nK^#xgv=LtnArX|vWQVuw3}B${h+frU2>9^
z!l6)!Uo4`5k`<<;E(ido7M6lKTgWezNLq>U*=uz<KVOwgK<qq^3FEy1LAV}ep3|Zt
z>&s=cc$1%>VrAeOoUtA|T6gO4>UNqsdK=NF*8|~*sl&wI=x9-EGiq*aqV!(VVXA57
zw9*o6Ir8Lj1npUXvlevtn(_+^X5rzdR>#(}4YcB9O50q97%rW2me5_L=%ffYPUSRc
z!vv?Kv>dH994Qi>U(a<0KF6NH5b16enCp+mw^Hb3Xs1^tThFpz!3QuN#}KBbww`(h
z7GO)1olDqy6?T$()R7y%NYx*B0k_2IBiZ14&8|JPFxeMF{vW>HF-Vi3+ZOI=+qP}n
zw(+!WcTd~4ZJX1!ZM&y!+uyt=&i!+~d(V%GjH;-NsEEv6nS1TERt|RHh!0>W4+4pp
z1-*EzAM~i`+1f(VEHI8So`S`akPfPTfq*`l{Fz`hS%k#JS0cjT2mS0#QLGf<qk6YP
z4Er$vWjm9AtrmaEcJtwQPu$b|CILfR!BT!3=m=0Uak0Q;VGQ0gEM~G39Hp3;#AakH
z>=J?1`he3W*;m4)ce8*WFq1sdP=~$<O3ReQ51n^2?wBcx4J{H~K59j4Qm0vhJ-n@m
zHBMJ|T;;f3zj(Uyi)llm@?gt0n0w!f8n()c99xBcdSOxn@j!L)jwK%4`?=H_q?MBp
z^QQh#^;N*P5@#PmXt<?Q+Lm$P5_(9b2seQ@#UslmPW-%=P%J~U3fLRt83J5N*lBqC
zY$EfyGO&90Gq$$|<KSW0kWuMHIjN5lQ<I);A*RCO{?oF!aQ;(kWjh8r*}5ulFL)Vb
zTtg3jbL+;~@7u|Y;ZPGCpJj_r6f>5RlH1EdWm|~dCvKOi4*I_96{^95p#B<(n!d?B
z=o`0{t+&OMwKcxiBECznJcfH!fL(z3OvmxP#oWd48|mMjpE||zdiTBdWelj8&Qosv
zZFp@&UgXuvJw5y=q6*28AtxZzo-UUpkRW%ne+Ylf!V-0+uQXBW=5S1o#6LXNtY5!I
z%Rkz#(S8Pjz*P7bqB6L<Vk~pjchG@}qdN#@wtSW<TMz{!1u}v!swzUaA7F&@sFu3N
zjK(L;!X^C;`_w7K{}ngRs_X~yp8)k=Bm<}VSAjkJUw3k>|M#Er{|QLae-Y{KA>`^}
z@lPjeX>90X|34S-7}ZVXe{wEei1<{*e8T-Nbj8JmD4iwcE+Hg_zhkPVm#=@b$;)h6
z<<6y`nPa`f3I6`!28d@kdM{uJOgM%`EvlQ5B2bL)Sl=|y@YB3KeOzz=9cUW3clPAU
z^sYc}xf9{4Oj?L5MOlYxR{+>w=vJjvbyO5}ptT(o6dR|ygO$)nVCvNGnq(6;bHlBd
zl?w-|plD8spjDF03<K+#yS4SJ*V)0km=&VI5X(%sge51blw8Cl<Ju^5<>g5ip;W3Z
z><0{BCq!Dw;h5~#1BuQilq*TwEu)qy50@+BE4bX28+7erX{BD4H)N+7U`AVEuREE8
z;X?~fyhF-x_sRfHIj~6f(+^@H)D=ngP;mwJjxhQUbUdzk8f94Ab%59-eRIq?ZKrwD
z(BFI=)xrUlgu(b|hAysqK<}8bslmNNeD=#JW*}^~Nrswn^xw<P9O3CCOGFfUE5Q<h
z1T|`wz@Em2i=pC~@r%^(MvQYV;f5vxXhgVXob}0Gx1_TUzP+Rpj@2*{4qZ~TIcEo3
z#39(j%E7l3j?{>*nL@Tx!49bfJecV&KC2G4q5a!NSv)06A_5N3Y?veAz;Gv+@U3R%
z)~UA8-0LvVE{}8LVDOHzp~2twReqf}ODIyXMM6=W>kL|OHcx9P%+aJGYi_Om)b!xe
zF40Vntn0+VP>o<$AtP&JANjXBn7$}C@{+@3I@cqlwR2MdwGhVPxlTIcRVu@Ho-wO`
z_~Or~IMG)A_`6-p)KPS@cT9mu9RGA>dVh5wY$NM9-^c@N=hcNaw4ITjm;iWSP^ZX|
z)_XpaI61<+La<UOuY!W@V|9Mkiq|8%=#8z5hS3|`W2~?EAxL1Az-d#EmITDc8NIP9
ztj|z{8|BEoYj#D_4?j^O6raGm4aht<G6)sm9P=m81*eB3srLs&r9pje8GUX*!3ADN
ze{E=*S7~Y(%I(9)2E=XG-qKL}($?bVzv9WQsD=FK-(rXKzp|@{{`YwLAKRJ|4JdD1
zHLRar6OKRIb~25&ATpMCBErsBr5J2-`E$h@V?tx(6*5t-jUSB}W^QH~8Ph@~_~97&
z`${rusCAKr?7|#yNaX;)Fo+VblG0rdf@)X!Zq~XS$2j)K;^+OQea}CIiu>+U&&%2a
z0za$)-wZP@mwSELo#3!PGTt$uy0C(nTT@9NX*r3Ctw6J~7A(m#8fE)0RBd`TdKfAT
zCf@$MAxjP`O(u9s@c0Fd@|}UQ6qp)O5Q5DPCeE6mSIh|Rj{$cAVIWsA=xPKVKxdhg
zLzPZ`3CS+KIO;T}0Ip!fAUaNU>++ZJZRk@I(h<)RsJUhZ&Ru9*!4Ptn;gX^<l^v_i
zqC|6W?GR}jrt}L9iL{9D{65?&{N;&~j4+gllyKZ=yU-^d7^ury)bvm`^J81T+#eA(
zx>~4E8W^TSR&~3BAZc#HquXn)OW|TJ`CTahk+{qe`5+ixON^zA9IFd8)kc%*!AiLu
z>`SFoZ5bW-%7}xZ>gpJcx_hpF$2l+533{gW{a7ce^B9sIdmLrI0)4yivZ^(Vh@-1q
zFT!NQK$Iz^xu%|EOK=n>ug;(7J4OnS$;yWmq>A;hsD_0oAbLYhW^1Vdt9>;(JIYjf
zdb+&f&D4@4AS?!*XpH>8egQvSVX`36jMd>$+RgI|pEg))^djhGSo&#lhS~9%NuWfX
zDDH;3T*GzRT@5=7ibO<WzoGW!nNc52nrC(cymgy1Lz%-9op$(?L%Tk422ve)uZV7a
zsp5771}9L~!~`m&sgd(H^64_vrcS77VrmV>>N-6_XPBYxno@mD_3I#rDD?iADxX`!
zh*v8^i*JEMzyN#bGEBz7;UYXki*Xr(9xXax(_1qVW=Ml)kSuvK$coq2A(5ZGhs_pF
z$*w}FbN6+QDseuB9=fdp_MTs)nQf!2SlROQ!gBJBCXD&@-VurqHj0wm@LWX-TDmS=
z71M__vAok|@!qgi#H&H%Vg-((ZfxPAL8AI{x|VV!9)ZE}_l>iWk8UPTGHs*?u7RfP
z5MC&<!h(=@IG4-0X2tnigfo9~%TLVoosSMBfl=G*mZw4{Zua5kXdy3I7p<Xy+8}($
zhLvoK3s(sydD^%uJ}IUZMoWj=*qlU40O;)bVi#tp{1ux3_@3jm^2j~vj%1GASfg@5
zGNfnTI2^*1*7ks%yk(@Y4r|6FG^%_*GuH5$QM5s}XH~rYF%4%QB7k!9ggpP0l|u!h
zGIy~gC#YvDD##t|sXilU#?S{%SChQ8kxdkTTxL^C+cuzXq(*Nma5Y|#4Bc8umW{g;
z9n<Rg(1(9zzS0`I-Jd;?lX-*7gwjiL^p}0QD;0M`vI9>=c6X;XlUzrz5q?(!eO@~*
zoh2I*%J7dF!!_!vXoSIn5o|wj1#_>K*&CIn{qSaRc&iFVxt*^20ngCL;QonIS>I5^
zMw8HXm>W0PGd*}Ko)f|~dDd%;Wu_RWI_d;&2g6R3S63Uzjd7dn%Svu-OKpx*o|N>F
zZg=-~<CUMsZy=MLYXhx$6Ezl(Wb9PjoV#|)EKT+}6Qe}84fqt}B`P>qLb~VRLpv`k
zWSdfHh@?dp=s_X`{yxOlxE$4iuyS;Z-x<z@U4S3P>!*E6eqmEm*j2bE@=ZI0YZ5<B
ziu=C@#BMievAp7JPV$P@fr0dUNvi3Gx;Pj4gW>%Yj29!5+J$4h{s($nakA`xgbO8w
zi=*r}PWz#lTL_DSAu1?f%-2OjD}NHXp4pXOsCW;DS@BC3h-q4_l`<))8WgzkdXg3!
zs1WMt32kS2E#L0p_|x+x**TFV=gn`m9BWlzF{b%6j-odf4{7a4y4Uaef@YaeuPhU8
zHB<k@dqe3LhnH`J^UJOd90Ox@obYaLr`@$-=nrU6zI=GPf#UGJRytEPM{67L(=r^c
z^3n10M$|<;{(uM3vPXxEBu32nR}KqrqRKRksB|r7a1C?yimB*Dy3>vRqN^;$Jizy+
z=zW{E5<>2gp$pH{M@S*!sJVQU)b*J5*bX4h>5VJve#Q6ga}cQ&iL#<n)GXz#1c<<(
z)>=(u+KroWrxa%8&~p{WEUF0il=db;-$=A;&9M{Rq`ouZ5m%BHT6%st%saG<NKro#
z@Q{g@pPU`$<e5UmDn9S+_cJu6pkYhpl6*&!LvF)bN+){V;z%0^o1y!i&{B)Lj0FjV
zYYp-rmqYj!QuF~3zGYt|Qq~nsCzjRB{(R{ty`1&yQx$=`l2m9qGgk_JV~mw&a6Q|<
zc1lM3&EalKN6_t1KC)j(Q$V!M(_DL07kS7QQWU|M8Wk4TF*B{N#~(}MEO<-Q2dm3K
z8NXr}ekjWF3by^mo+Q3XYGVviQ)x>sD6)fQgLN}x@d3q>FC;=f%O3Cyg=Ke@Gh`XW
za@RajqOE9UB6eE=zhG%|dYS)IW)&y&Id2n7r)6p_)vl<ng|pu2hODuSH@fnEV39NO
zEa|mP`g<9Fl&vbZh$P6G!sc4+bi`HbS{o8YqRR?<FFZb8$d9L}J7EUaZY{B2CQAoP
zG;0eBmOW)@Ww{Qz4ftAcoOH?fY7sN`HK{pClFtZ6OV%DFh*#N6L_mG5K6^(3xOT`2
zXQFK>RP7NJL(x4UbhlcFXWT8?K=%s7;z?Vjts?y2+r|uk8Wt(DM*73^W%pAkZa1Jd
zNoE)8FvQA>Z`eR5Z@Ig6kS5?0<D?<!n}@f|qPQY>h;`Y&OL2D&xnnAUzQz{YSdh0k
zB3exx%A2TyI)M*EM6htrxS<tv!Edgia|5gcd)~ip*3<ew;`$^STiylI`z5{ztT8_E
zz7=GR1{89$qD3=xzAIqy@BBJmiMI0ki{$Knumb#c#N3P5enJ?LK<vaPmBAGd)gnQo
zINHDTC;w*AY<*a~K{duN*{|U_y!Fz#=S`fLYNgV#k5=Li&i{#9U0nggJ79U;3r1-&
z&(5bC_;o)|^$FU#7Y~PUV2864^kKs(<coBxWYsDLnpdnx`B%k#BXst!77q6}Ls?(}
zb?GN{VITSdSDPl&{KTz_%@p`6W7qG-E&4{ewx1KOmsXg|G_Gn9gWeg#9N-UI_zUE<
zo7oV#e7|g=?GpSw806m8iho~kvv%|&vxWzo2C8F7^%vgDYOsXNbx*m1|I&|M(Fyox
zN==RF3%%g=zf>lep!Kk(P(VP`$p0G~f$smld6W1r_Z+o<z7~@9wx+W7_SUWr|6?N;
z^M5$dG~2%Uno5eQCTf&Wn=$($Vn%_=e+$4D0VsKyXV+K1&wNdPw}$@5)dI#iQ2f6s
z&=%4AK@2R;v)Rr!?QX}LFSGi;wniiSIu8zhAH?jWt%L(>?=IB@^weq>5VYsYZZR@`
z&XJFxd5{|KPZmVOSxc@^%71C@;z}}<y7D=}>WhbF9p!%yLj3j%YOlPL5s>7I3vj25
z@xmf=*z%Wb4;Va6SDk9cv|r*lhZ`(y_*M@>q;wrn)oQx%B(2A$9(74>;$zmQ!4fN;
z>XurIk-7@wZys<+7XL@0Fhe-f%*=(weaQEdR9Eh6>Kl-EcI({qoZqyzziG<swkun|
zz9QhYhE~<?Mav;|ewGy6Y~<x|NE!uh-`J1|c<Yr?P+t8bg{Fv<zLV)d!x`rU#nMKo
zD7y~u8QWpi`5aU`p_CtE_?sxWUU1kB-JW+SX;AWeWqd=cJaDp2c>wpg-GM#251sK_
z=3|kitS!<yV_xifsX8xKeGo1-@iv*7QRBn>j%;fpc@oWn65SEL73^N&t>Ix37xgs=
zYG%eQDJc|rqHFia0!_sm7`@lvcv)gfy(+KXA@E{3t1DaZ$DijWAcA)E0@X?2ziJ{v
z&KOYZ|DdkM{}t+@{@*6ge}m%xfjIxi%qh`=^2Rwz@w0cCvZ&Tc#UmCDbVwABrON^x
zEBK43FO@weA8s7zggCOWhMvGGE`baZ62cC)VHyy!5Zbt%ieH+XN|OLbAFPZWyC6)p
z4P3%8sq9HdS3=ih^0OOlqTPbKuzQ?lBEI{w^ReUO{V?@`ARsL|S*%yOS=Z%sF)>-y
z(LAQdhgAcuF6LQjRYfdbD1g4o%tV4EiK&ElLB&^VZHbrV1K>tHTO{#XTo>)2UMm`2
z^t4s;vnMQgf-njU-RVBRw0P0-m#d-u`(kq7NL&2T)TjI_@iK<Yl@Cqk*~m37SNedq
zx~`h1%FdLq@}}y&UU;hbH}<-!s6Iy2g)B^rs=bfBbkxYx`xjMBufD=^9fzM?t8cS)
zL$U1d(u_2VkEZvw)XSRPEuRSd@v%dbMvD4b*3DiP)|TB2B-!fP9)HV`H7jQwnKD!5
z4Bl=}Gnt7oe@IOmCR%K@Z>uPAK-@oH(J8?%(e!0Ir$yG32@CGUPn5w4)+9@8c&pGx
z+K3GKESI4*`tY<Qi4rZ<epYj8$_z7>lmMHt@br;jBWTei&(a=iYslc^c#RU3Q&sYp
zSG){)V<(g7+8W!Wxeb5zJb4XE{I|&Y4U<YEr@blpS4m(aRaC`M>rFWr%LHkdQ;~XU
zgy^dH-Z3lmY+0G~?DrC_S4@=>0oM8Isw%g(id10gWkoz2Q%7W$bFk@mIzTCcIB(K8
zc<5h&ZzCdT=9n-D>&a8vl+=ZF*`uTvQviG_bLde*k>{^)&0o*b05x$MO3gVLUx`xZ
z43j+>!u?XV)Yp@MmG%Y`+COH2?nQcMrQ%k~6#<!a&35z3p3DcO>O%PeD_WvFO~Kct
za4XoCM_X!c5vhRkIdV=xUB3xI2NNStK*8_Zl!cFjOvp-AY=D;5{uXj}GV{LK1~IE2
z|KffUiBaStRr;10R~K2VVtf{TzM7FaPm;Y(zQjILn+tIPSrJh&EMf6evaBKIvi<yK
z#RB{W*oF07TSG5RJBQ_^g55O+JVKqJ`<PhMC|G*bU6n?G-P$xU{#c-T{;Xu*PvKnV
zyuH|XWFi(ZE1SlO<(wqK6SUpCJY^6V-6C0iNb31Cd48ZR$k%O|R>42-WYU9Vhj~3<
zZSM-<FUSd*KTLc@iqJH4(EY)tX8|ta3ZTISXd9!f+oVa;L;Ft!n%L_%K*8rrEc`HY
zX)ocw^5zdFAJ2MXFq%F-J$3DK80Hc&5j)``0(=0xRT`^QE?Dy6=Vy}CsjCVeROW4g
z{IsuKjfkViXE7DY?EaXa7#12bFna0eXqK&rV+BU3LburO;nEt55)>B;E`g_<F%yqW
zl=jgB;B?y%j;0;(THB3Q9hQAYXtBuDp*E}Uj$5N=C<9X8uE<0-laKa@eX5W;R<VA(
zt<&PXc4W?o?GbkBXX5W}<aNEQ(MNw;D_!_}l$Q$UNNXPm^OVm3@2rdW2+*M+a-MMs
zjRWm0n>o8_XTM9IzEL=9Lb^SPhe(f(-`Yh=X6O7+6ALXnTcUFpI>ekl6v)ZQeNCg2
z<E^>^H|{SKXHU*%nBQ@I3It0m^h+6tvI@FS=MYS$ZpBaG7j#V@P2Zu<MHh7FYbiW#
z92Ygt@PECqm2My`r9GWaSztN%GJLWXz`0z!=1kbkc)5?8!2Z52gHY{=!#7C;{uL6-
z2*!WgHi8eCJ}bct7Xienl_OBRz{m$%0}9N;V6~=OG{<pEQedj6vuNk3>YySbp@hA#
ze(kc;P4i_-_UDP?%<<P3orxZa7U@-N674Sn%1SYZY+uLA*0XfQ^(5KJZx8Q`Tygfv
zKQy0(Okhy6k9nXB!#dt!xoT%v@ATzwvoabdPwR@Uq6H`U3!2Q81Z!I$3_<rBTaP}T
zLZ{~t18JM3$|ne5V}1ovY>6>%tTRih6VBgScKU^BV6Aoeg6Uh(W^#J^V$Xo^4#Ekp
ztqQVK^g9gKMTHvV7nb64UU7p~!B?>Y0oFH5T7#BSW#YfSB@5PtE~#SCCg3p^o=N<F
zOIO82TuHtV7O7CgEGI_xm6ZJaV)lc8USp)~BUgr~-fu{)Eb@zARpJARd&>kMk$<8-
z6PT*yIKGrvne7+y3}_!AC8NNeI?iTY(&nakN>>U-zT0wzZf-RuyZk^X9H-DT_*wk=
z;&0}6LsGtfVa1q)CEUPlx#(ED@<R%-$Z>-?H<1_FrHU#z5^P3lEB|qsxEyn%FOpjx
z3S?~gvoXy~L(Q{Jh6*i~=f%9kM1>RGjBzQh_SaIDfSU_9!<>*Pm>l)cJD@wlyxpBV
z4Fmhc2q=R_wHCEK69<*wG%}mgD1=FHi4h!98B-*vMu4ZGW~%IrYSLGU{^TuseqVgV
zLP<%wirIL`VLyJv9XG_p8w@Q4HzNt-o;U@Au{7%Ji;53!7V8Rv0^Lu^Vf*sL>R(;c
zQG_ZuFl)Mh-xEIkGu}?_(HwkB2jS;HdPLSxVU&Jxy9*XRG~^HY(f0g8Q}iqnVmgjI
zfd=<H;-i%#%U^8-(Z{Z4b>``2&8GsycjR?<a&U|nts04(0ihI)2!9?v1T?nCCI(9r
zpdN)6%kf_@sPS;86J@yRo$(Ot`8RM_BRe*|Q<$R1O-;4dm(aGGe|)WtWy)O@G|Vqn
z_;A=;TRYm3YVhigO6Nz~<ymK3%?_sMR-!XnXMuDcij{$qdtz6k*4BU;QD#-$No-&n
zJ)QEhM9>M%(zM<lMq^mJGAsjn-C?tg9{)Zt8QiLul98br55J^m*$NU4C!D)yxk52I
z`rTJ7m%K~&__tPV4Pz9N(K=d<onE1ZT_Tp4hYcUmr?}nQF}>jn;tn9agcq;&rR!Hp
z$B*gzHsQ~aXw8c|a(L^LW(|`yGc!qOnV(ZjU_Q-4z1&0;jG&vAKuNG=F|H?@m5^N@
zq{E!1n;)kNTJ>|Hb2ODt-7U~-MOIFo%9I)_@7fnX+eMMNh>)V$IXesJpBn|uo8<!Q
zy$D5)r&io45LrvXm~vJ*1u}8aJ)|XWG|rzRx7nuN!$Z2be^-#jZzi6>f~#aOFytCT
zf9&%MCLf8mp4kwHTcojWmM3LU=#|{3L>E}SKw<F*FiG2?-z5s1VW-snjmt-h7!eIx
z&uIpXoS|F?y%PG#rXK+?EA;j*5>Od?%{HogCZ_Z1BSA}P#O(%H$;z7XyJ^sjGX;j5
zrzp>|Ud;*&VAU3x#f{CKwY7Vc{%TKKqmB@oTHA9;>?!nvMA;8+Jh=cambHz#J18x~
zs!dF>$*AnsQ{{82r5Aw&^7eRCdvcgyxH?*DV5(I$qXh^zS>us*I66_MbL8y4d3ULj
z{S(ipo+T3Ag!+5`NU2sc+@*m{_X|&p#O-SAqF&g_n7ObB82~$p%fXA5GLHMC+#qqL
zdt`sJC&6C2)=juQ_!NeD>U8lDVpAOkW*khf7MCcs$A(wiIl#B9HM%~GtQ^}yBPjT@
z+E=|A!Z?A(rwzZ;T}o6pOVqHzTr*i;Wrc%&36kc@jXq~+w8kVrs;<?N6^ISl4!Z9~
z3H7NeM`>%=IFdACoLAcCAmhFNpbP8;s`zG|HC2Gv?I~w4ITy=g$`0qMQ<L5=NnfW-
zg{GqAs=rbBj@&~(5JRvPTR2SbUf=%t)J-w@#*YSI#9gYrdT6pVa6}sJOfzVD5U5CM
z!FKyXe+4H9quh&F;}wlo7^AkDC1D+oJ5CSDq$g*_*zj7hLnb7{$2~k{aoF`(1Z38Y
zO1=ee_zVE?hcLNJ0j<VtTax5XpQf7Xv(=%$QBe2Nb|8>dkijLSOtX6xW%<qYBBH&g
z!6W;bvDP#r^}cEvKKpmH7G`2YO(q`uP#Sl|D}SJUH&57yXI4Y2Jz0(y$1*#H`fVNA
z3<2b_*e8PoU3-sqp_X=8rg@0Ur_$*UWvvK7sl+-mBAeDAwgv9<RDGj%%>Z9Nw<;M-
zMN`c7=$QxN00DiSjbVt9Mi6-pjv*j(_8PyV-il8Q-&TwBwH1gz1uoxs6~uU}PrgWB
zIAE_I-a1EqlIaGQNbcp@iI8W1sm9fBBNOk(k&iLBe%MCo#?xI$%ZmGA?=)M9D=0t7
zc)Q0LnI)kCy{`jCGy9lYX%mUsDWwsY`;jE(;Us@gmWPqjmXL+Hu#^;k%eT>{nMtzj
zsV`Iy6leTA8-PndszF;N^X@CJrTw5IIm!GPeu)H2#FQitR{1p;MasQVAG3*+=9FYK
zw*k!HT(YQorfQj+1*mCV458(T5=fH`um$gS38hw(OqVMyunQ;rW5aPbF##A3fGH6h
z@W)i9Uff?qz`YbK4c}JzQpuxuE3pcQO)%xBRZp{zJ^-*|oryTxJ-rR+MXJ)!f=+pp
z10H|DdGd2exhi+hftcYbM0_}C0ZI-2vh+$fU1acsB-YXid7O|=9L!3e@$H*6?G*Zp
z%qFB(sgl=FcC=E4CYGp4CN>=M8#5r!RU!u+FJVlH6=gI5xHVD&k;Ta*M28BsxfMV~
zLz+@6TxnfLhF@5=yQo^1&S}cmTN@m!7*c6z;}~*!hNBjuE>NLVl2EwN!F+)0$R1S!
zR|lF%n<Z;3@QYn3!QXr}w{~b2!0#&RhtQVWc+f3LI)E%uRJsv*AbN^=z5ui!ge)I%
zD^_`CW{mnHj8Q^}OH9sOV*MC5m`xMj4NVNzK1NE#4~~!Nsf_i{LKv7+J}YXZ!8b$I
zuKSZ>!9fkZ@gPW|x|B={V6x3`=jS*$Pu0+5OWf?wnIy>Y1MbbGSncpKO0qE(qO=ts
z!~@&!N`10S593p<N-}Sr%Ku9LOog5tCN!E>VQu4FzpOh!tvg}p%zCU(aV5=~K#bKi
zHdJ1>tQSrhW%KOky;iW+O_n;`l9~omqM%sdxdLtI`TrJzN6BQz+7xOl*rM>xVI2~#
z)7FJ^Dc{DC<%~VS?@WXzuOG$YPLC;>#vUJ^MmtbSL`_yXtNKa$Hk+l-c!aC7gn(Cg
ze?YPYZ(2Jw{SF6MiO5(%_pTo7j@&DHNW`|lD`~{iH+_eSTS&OC*2WTT*a`?|9w1dh
zh1nh@$a}T#WE5$7Od~NvSEU)T(W$p$s5fe^GpG+7fdJ9=enRT9$wEk+ZaB>G3$KQO
zgq?-rZZnIv!p#>Ty~}c*Lb_jxJg$eGM*XwHUwuQ|o^}b3^T6Bxx{!?va8aC@-xK*H
ztJBFvF<Pib!UnGu#KYqKrd=TzpEnL0gJH#*@ED-E8J}0-de@s{a{t7?6tKTujrhud
z<MMQD2dV}=jia5D4*N2CxQf92(j>fsSWu89%@b^l3-B~O!CXs)I6Y}y#0C0U0R0WG
zybjroj$io0j}3%P7zADXOwHwafT#uu*zfM!oD$6aJx7+WL%t-@6^rD_a_M?S^>c;z
zMK580bZXo1f*L$CuMeM4Mp!;P@}b~$cd(s5*q~FP+NHSq;nw3fbWyH)i2)-;gQl{S
zZ<MGOIR=>O!T}A}fC}vUdskGSq&{`oxt~0i?0xhr6I47_tBc`fqaSrMOzR4>0H^;A
zF)hX1nfHs)%Zb-(YGX;=#2R6C{BG;k=?FfP?9{_uFLri~-~AJ;jw({4MU7e*d)?P@
zXX*GkNY9ItFjhwgAIWq7Y!ksbMzfqpG)IrqKx9q{zu%Mdl+{Dis#p9q`02pr1LG8R
z@As?e<Q+6)P&pQ<Pq0P^Uzcb2ET2_(Em9qV!^3ZcR(NNe8E)|u;wHjG5KcXc!!rLc
z4mjsg)J~QuG>G!>IoROgS!@J*to<27coFc1zpkh?w=)h9CbYe%^Q!Ui46Y*HO0mr%
zEff-*$ndMNw}H2a5@BsGj5oFfd!T(F&0$<{GO!Qdd?McKkorh=5{EIjDTHU`So>8V
zBA-fqVLb2;u7UhDV1xMI?y>fe3~4urv3%PX)lDw+HYa;HFkaLqi4c~VtCm&Ca+9C~
zge+67hp#R9`+Euq59WhHX&7~RlXn=--m8$iZ~~1C8cv^2(qO#X0?vl91gzUKBeR1J
z^p4!!&7)3#@@X&2aF2-)1Ffcc^F8r|RtdL2X%HgN&XU-KH2SLCbpw?J5xJ*!F-ypZ
zMG%AJ!Pr&}`LW?E!K~=(NJxuSVTRCGJ$2a*Ao=uUDSys!OFYu!Vs2IT;xQ6EubLIl
z+?+nMGeQQhh~??0!s4iQ#gm3!BpMp<uE*}8S{E1m>nY?04<yW_?_zEz4Fj}0M+XJa
z3q}R#{(fCjx;Y>kK375e((Uc7B3RMj;wE?BCoQGu=UlZt!EZ1Q*auI)dj3Jj{Ujgt
zW5hd~-HWBL<R`{s-5K1~dR*!^jDV2ZK1|^O_h466g}C(k?2!w)yq_37Ey>I_3HuO)
zNrb^XzPsTIb=*a69wAAA3J6AAZZ1VsYbIG}a`=d6?PjM)3EPaDpW2YP$|GrBX{q*!
z$KBHNif)OKMBCFP5>!1d=DK>8u+Upm-{hj5o|Wn$vh1&K!lVfDB&47lw$tJ?d5|=B
z^(_9=(1T3Fte)z^>|3**n}mIX;mMN5v2F#l(q*CvU{Ga`@VMp#%rQkDBy7kYbmb-q
z<5!4iuB#Q_lLZ8}h|hPO<Ht1(OGn{bUSM8Q`ddT$%K;CN*lIJA+6r*T9snG0=^c25
z5_3XaQLxf6@JgUvU>DI^U6`gzLJre9u3k3c#%86IKI*^H-@I48Bi*@avYm4v!n0+v
zWu{M{&F8#p9cx+gF0yTB_<2QUrjMPo9*7^-uP#~gG<Xmu<lOOHc1#9#_q*hHkI37%
zz3mcsrp?o~toa!d>W~y3nfPAoV%amgr>PSyVAd@l)}<t7QAjA@@*mov`DUk2U9U+~
z6y?uo4okf(u(xFv&$u#$80KWvEz#3d+8^2OB@t9YT#~6vMlD-x@pFtG=5aTP?>8#X
zR5zV6t*uKJZL}?NYvPVK6J0v4iVpwiN|>+t3aYiZSp;m0!(1`bHO}TEtWR1tY%BPB
z(W!0DmXbZAsT$iC13p4f>u*ZAy@JoLAkJhzFf1#4;#1deO8#8d&8<JXo#K9YHQ|!H
zK#vLo&LHQgM>9}en&z!W&A3++^1(;>0SB1*54d@y&9Pn;^IAf3GiXbfT`_>{R+Xv;
zQvgL>+0#8-laO!j#-WB~(I>l0NCMt_;@Gp_f0#^c)t?&#Xh1-7RR0@zPyBz!U#0Av
zT?}n({(p?p7!4S2ZBw)#KdCG)uPnZe+U<qz4!fXQ+YLU=^#RQ2SgDfa2D{{X!*)5l
z#ZIzzvKO;$K}0kpBv7O!+cBBq!g7CI0HranNuQzvG-Wt^KM{0!cpx$J>|0{BW!m)9
zi_9$F?m<`2!`JNFv+w8MK_K)<HQ-H#PMhgOnaa+`IdT&GT6op4j;f0)5%ucT=<`_1
z;V&i{n>qJ^aO@7-Ig>cM4-r0bi=>?B_2mFNJ}aE3<!&TD*_)><+QCzRr*NA!QjHw#
z`1OsvcoD0?%jq{*7b!l|L1+Tw0TTAM4XMq7*ntc-Ived>Sj_ZtS|uVdpfg1_I9knY
z2{GM_j5sDC7(W&}#s{jqbybqJWyn?{PW*&cQIU|*v8YGOKKlGl@?c#TCnmnAkAzV-
zmK={|1G90zz=YUvC}+fMqts0d4vgA%t6Jhjv?d;(Z}(Ep8fTZfHA9``fdUHkA+z3+
zhh{ohP%Bj?T~{i0sYCQ}uC#5BwN`skI7`|c%kqkyWIQ;!ysvA8H`b-t()n6><Hpfb
z)@#PwiGQ~=`lZV*1B)Z)2sk2h{`bj2<1wDxA=4)3jShpfA|O~e*{h%+y_ei;PtNbH
z3p4EQlWjQ)Dt%0U5p0XCs}7chjj|k>GJj6xlYDu~8qX{AFo$Cm3d|XFL=4uvc?Keb
zzb0ZmMoXca6Mob>JqkNuoP>B2Z>D`Q(TvrG6m`j}-1rGP!g|qoL=$FVQYxJQj<!01
zc$z6Z4D6FFjDgqNUK}k#(?6uz7Kv-uz*f0IQ_!{gk(xo?1k6>Fn33lODt3Wb1j8VR
zlR++vIT6^DtYxAv_hxupbLLN3e0%A%a+hWTKDV3!Fjr^cWJ{scsAdfhpI)`Bms^M6
zQG$waKgFr=c|p9Piug=fcJvZ1ThMnNhQvBAg-8~b1?6wL*WyqXhtj^g(Ke}mEfZVM
zJuLNTU<Y;z6CCxpz=-FX7ULn*>Vh#WsE*a6uqiz`b#9ZYg3+<SW=)OY-`O&5UD_N)
z<H3&T!$NV26UoOi=?{n|wkIgche+iHAY{4>2%=C(6AvZGc=u&<6??!slB1a9K)=VL
zY9E<GDLqaxvx+)wlOmO*XduQxLAJd+iQj@!Z<uKq$J2FGt#9Tr=<Tc&M!MF9@NGf2
zm1{PQ6xp*C<NBt$&N4$VpNZk45bDyp7+d0PHlsv0V3@nTL9?@JERq+}n>L^mfyKnD
zSJyYBc_>G;5RRnrNgzJz#Rkn3S1`mZgO`(r5;Hw6MveN(URf_XS-r58Cn80K)ArH4
z#Rrd~LG1W&@ttw85cjp8xV&>$b%nSXH_*W}7Ch2pg$$c0BdEo-HWRTZcxngIBJad>
z<lyo6>;C>b{jIXjb_9Jis?NZJsdm^EG}e*pR&DAy0EaSGi3XWTa(>C%tz1n$u?5Fb
z1qtl?;_yjYo<O>)(gB^iQq?=jusF%kywm?CJP~zEHi0NbZ);$(H$<Ci|13DUx!yz;
z+M(KR6wmu~m;82Snu4KcaM^(5dZN&iTm{uTO>w(Hy@{i>$wcVRD_X|w-~(0Z9BJyh
zhNh;+eQ9BEIs;tPz%jSVnfCP!<TL*21Ig5x*|%YRb7J^Ma@~83X~Ui1`Xoj`9wUa;
z_gZ!{qp$&7dj}IuWQY`2czqfaX<4EcZ9Qv$I0(~>3L&9YtEP;svoj_bNzeGSQIAjd
zBss@A;)R^WAu-37RQrM%{DfBNRx>v!G31Z}8-El9IOJlb_MSoMu2}GDYycNaf>uny
z+8xykD-7ONCM!APry_Lw6-yT>5!tR}W;W`C)1>pxSs5o1z#j7%m=&=7O4hz+Lsqm`
z*><Gr$}*-ppL1G4JXetI6OhQSP-=!E(qBh;-Lhj_ErXakU5*7JVQl=3thaJ&{b?r4
zHLLetl=`rHKmC^DZ=rZc%_Tv<sm?1X-jh0v)$VMoFmNu@n(6m9(}Xi)VQ&}*Hw5IB
zWZh;R&hcDO^)o`6+gyEscoY}7^&qxlo-k==U=w?}+^rFfK1LyXt@ynTxYqS5tWs?T
z_sSc?k6~c<cIR}1@`(DC0_#w-Mx8(n#uFqOGns~@PKe;IKK9ON?|3&q3x3PH4cbqE
zq>{+xsabZPr&X=}G@obTb{nPTkccJX8w3CG7X+1+t{JcMab<p3e{zB@Dy5xNBVUe#
zv-HzkrwCd|ur>v~UNv+G?txRqXib~c^Mo}`q{$`;EBNJ;#F*{gvS<LN1an2JB&QCp
zlkPO7z&H(gctlrYu-&@hVkG4O;%Vuh$VreV3pza|dTLfCDcMph;nE`=mX0B=ZJX<_
z2k5-=Lpc=*G-hP%MZB<_yxIt?#=KnX*_f)p9^P#ybpx$jR)F77HUV8at47p1srHm1
zn2h)l)DefSwHU4fP_Bn=N!ZBm#WSTuHiadtLh&UftOEG(_ga&>12kV?AZ%O0SFB$^
zn+}!HbmEj}w{Vq(G)OGAzH}R~kS^;(-s&=ectz8vN!_)Yl$$U@HNTI-pV`LSj7Opu
zTZ5zZ)-S_{GcEQPIQXLQ#oMS`HPu{`SQiAZ)m1at*Hy%3xma|>o`h%E%8BEbi9p0r
zVjcsh<{NBKQ4eKlXU|}@XJ#@uQw*$4BxKn6#W~I4T<^f99~(=}a`&3(ur8R9t+|AQ
zWkQx7l}wa48-jO@ft2h+7qn%SJtL%~890FG0s5g*kNbL3I&@brh&f6)TlM`K^(bhr
zJWM6N6x3flOw$@|C@kPi7yP&SP?bzP-E|HSXQXG>7gk|R9BTj`e=4de9C6+H7H7n#
z#GJeVs1mtHhLDmVO?LkYRQc`DVOJ_vdl8VUihO-j#t=0T3%Fc1f9F73ufJz*adn*p
zc%&vi(4NqHu^R>sAT_0EDjVR8bc%wTz#$;%NU-kbDyL_dg0%T<S*i*u3Hs6+lgqYq
z=U+X6sPy+}rGITC?hxtW%fBoPzZ(q%eG*;pyhqF65AF>FafZwZ?5KZpcuaO54Z9hX
zD$u>q!-9`U6-D`E#`W~fIfiIF5_m6{fvM)b1NG3xf4Auw;Go~Fu7cth#DlUn{@~yu
z=B;RT*dp?bO}o%4x7k9v{r=Y@^YQ^UUm(Qmliw8brO^=NP+UOohLYiaEB3^DB56&V
zK?4jV61B|1Uj_5<ls`VDjV2#nriOpH?2Y9gq*|Aq_a|{C0GK&?yC1IWVE!*7J_QU!
zL)l}65HCx(xyl-bqKf-Y8F;d9lVe|`H*b9>fBKW;8LdwOFZKWp)g{B%7g1~DgO&N&
z#lisxf?R~Z@?3E$Mms$$JK8oe@X`5m98V*aV6Ua}8Xs2#A!{x?IP|N(%nxsH?^c{&
z@vY&R1QmQs83BW28qAmJfS7MYi=h(Y<K@6de|}v(%PBod?sFh>K??@EhjL-t*5W!p
z<w%(*m8qPx>^gYX!Q6-vBqcv~ruw@oMaU&qp0Fb(dbVzm5xJN%0o_^<c3zq66m&UQ
zXFe#1m|fn2{5-vMM7v9BUDJ~>@fWq$oa3X?9s%+b)x4w-q5Koe(@j6Ez7V@~NRFvd
zfBH~)U5!ix3isg`6be__wBJp=1@yfsCMw1C@y+9WYD9_C%{Q~7^0AF2KFryfLlUP#
zwrtJEcH)jm48!6tUcxiurAMaiD04C&tPe6DI0#aoqz#Bt0_7_*X*TsF7u*zv(iEfA
z;$@?XVu~oX#1YXtceQL{dSneL&*nDug^OW$DSLF0M1Im|sSX8R26&)<Cw?RzB80c5
zchov=pW;)fO9DtUb$N7JrE{qsTHCLac~y=-bU_l$CqDBpgvMD+ebX+G{x#oBt0@0@
zs8XvzI-C6VRm<_8rd9XmKmBgn`Q!if6L7)!cXxM<><0Fbh^*l6!5wfSu8MpMoh=2l
z^^0Sr$UpZp<Z<TluQc!;PX0bU@N!&!1R5oI{8J?4NCf6cXR2|aH63{ey<h}Qu(AfI
zX{`*?csKabHH_jOykTP}gvwUdUuSLQIBnqWkN-*@I39xF4q<?Re*Ps8|8F0X{|EEu
z|0ECp-Ts$q{D1H_OcVaghc5I-vl%dI)or^K6R6GuuZR8=h$DoGDkS8PF_SG{lmRo|
zL@!D()apPK2t&{phCHh(CJKL;{cytLCw%{X_YQ6V;tU*zfN(O+(@GYEBQ5MU3b$c5
z2)Dqg0yw6Y>*9oqa23fcCfm7`ya2<4wzJ`Axt7<ql7Zuh>e4jJrRFVf?nY~2&tRL*
zd;6_njcz01c>$IvN=?K}9ie%Z(BO@JG2J}fT#BJQ+f5LFSgup7i!xWRKw6)iITjZU
z%l6hPZia>R!`aZj<ax(KfQmt5tY~l#crLCpMSe4{v4*~94qd;o{-lgquk&0mS3Sr0
z?xbxhS<n?JGpUJAPv?GfZ6Ax;WM=CsLr%GYp{4y{dqr4f0F$14l7WD)L`!DcGXO0r
z!W5ns0y7q4qhoaMs|$9uoA_h_DgS5B)*QG;%ZVHPz&*LmD~;PXG_kx4L#~m>wCp}I
zg)%20;}f+&@t;(%5;RHL>K_&7<lpuG9!<jkH5L3H16ZO7<&HDz>MH^S+7<|(SZH!u
zznW|jz$uA`P9@ZWtJgv$EFp>)K&Gt+4C6#*khZQXS*S~6N%JDT$r`aJDs9|uXWdbg
zBwho$phWx}x!qy8&}6y5Vr$G{yGSE<GpO{<0VEj@depRBhVX~w!R&b2>*r$^r{}pw
zVTZKvikRZ`J_IJrjc=X1uw?estdwm&bEahku&D04HD+0Bm~q#YGS6gp!KLf$A{%Qd
z&&yX@Hp>~(wU{|(#U&Bf92+<Cu;IS-m+vuQ`^8NBx8TZ-npPg&p%bRVNYg7jI+FyP
z%Bt-k?(nJB_HPID5jWS%(>1i&Q*-S+=y=3pSZy$#8Uc$#7oiJUuO{cE6=tsPhwPe|
zxQpK>`Dbka`V)$}e6_OXKLB%i76~4N*zA?X+PrhH<&)}prET;kel24kW%+9))G^JI
zsq7L{P}^#<HT~SsQ|>QsZViX%KgxBvE&#Xeugr>ZmFqe^oAg?{EI=&_O#e)F3V#rc
z8$4}0Zr19qd3tE4#$3_f=Bbx9oV6VO!d3(R===i-7p=Vj`520w0D3W6lQfY48}!D*
z&)lZMG;~er2qBoI2gsX+Ts-hnpS~NYRDtPd^FPzn!^&yxRy#CSz(b&E*tL|jIkq|l
zf%>)7Dtu>jCf`-7R#*GhGn4FkYf;B$+9IxmqH|lf6$4irg{0ept__%)V*R_OK=T06
zyT_m-o@Kp6U{l5h>W1hGq*X#8*y@<;vsOFqEjTQXFEotR+{3}ODDnj;o0@!bB5x=N
z394FojuGOtVKBlVRLtHp%EJv_G5q=AgF)SKyRN5=cGBjDWv4LDn$IL`*=~J7u&Dy5
zrMc83y+w^F&{?X(KOOAl-sWZDb{9X9#jrQtmrEXD?;h-}SYT7yM(X_6qksM=K_a;Z
z3u0qT0<b<{d*Rqdi6!;Ay!5Eja?*uuP?gOY*oZ6#cKb{bVkWMr$Xs<*`A=wu($fQA
zV_L3!)9i?x8+eI@Az9}8S%p9+q4}~4JnI^s0emO|n?r{dt@xLxVu7!x<Xq|vqL42(
zY7^CGYIyP<Yw;YvH1s|92ucU&v_U-loDlmik?2$6F^%?gfFmv2k6-h)Aud$YpHYZS
z3~f?LiBrm|0nm6Bao|Vz5vWJoI>TtaNvDER_8x*rxXw&C^|h{P1qxK|@pS7vdlZ#P
z7PdB7MmC2}%sdzAxt>;WM1s0??`1983O4n<p3HnUNdocTg~EP5M_Z&8=5Wbf%_zS<
z_QJgOH{E`NLBi`Wh~e_-*2B3KIt!e_M6dn>FK|hVAbHcZ3x{PzytQLkCVk7hA!Lo`
zEJH?4qw|}WH{dc4z%aB=0XqsFW?^p=X}4xnCJXK%c#ItOSjdSO`UXJyuc8bh^Cf}8
z@Ht|vXd^6{Fgai8*tmyRGmD_s_n<?IT$A%bkGk0exSr7aSQQNHpfXS3XS$DesbANT
zD{36qbeQe1<{>v~r^Fy7j`Bu`6=G)5H$i7Q7lvQnmea&TGvJp9a|qOrUymZ$6G|Ly
z#zOCg++$3iB$!6!>215A4!iryregKuUT344X)jQb3|9qY>c0LO{6Vby05n~VFzd?q
zgGZv&FGlkiH*`fTurp>B8v&nSxNz)=5IF$=@rgND4d`!Aaa<Y=2iKW7A<tO1HBkYo
z^Yb{S>X;_lK~)-U8la_Wa8i?NJC@BURO*sUW)E9oyv3RG^YGfN%BmxzjlT)bp*$<|
zX3tt?EA<bRJf-cg^UHM0QDLL3paTv>y<&K+bhIuMs-g#=d1}N_?isY)6Ay$mDOKRh
z4v1asEGWoAp=srraLW^h&_Uw|6O+r;wns=uwYm=JN4Q!quD8SQRSeEcGh|Eb5Jg8m
zOT}u;N|x@a<TPYf!pbsP>q)=&;wufCc^#)5U^VcZw;d_wwaoh9$p@Xrc{DD6GZUqZ
ziC6OT^zSq@-lhbgR8B+e;7_Giv;DK5gn^$bs<6~SUadiosfewWDJu`XsBfOd1|p=q
zE>m=zF}!l<cZunW1;`Sdxca_lfSvj1ac8QYf_WmDibHu*B3U7hlR%zl)2ai^XyV`c
zd?WZr>ObA%ePey~gqU8S6h-^J2Y?>7)L2+%8kV}Gp=h`Xm_}rlm)SyUS=`=S7msKu
zC|T<?u^C}Jwo`XP;8j?s?-^z{>!gPiI1rWGb1z$Md<e@<8fbuT7j-(kBkcn1WWTz!
zb2Tvs{=D6#ooQ%(Y9wf&Tk-+1QG7mL%wYz20iDrH);aX~hU$Se&}s=fTM#s``5s%8
zBnCp=awyqy1JuF!Z^%w_Z^AS45AEm8(L7^(vlPT*H1Y(3uz}pZa*+Rc|8miE6t*YI
zI&v4#bf~%?xPj^@+K_uN_tP(6XwVmS&aFYG6uCe^eJB1RqL#=2GB*cv4NYp6(`cXi
zqz(D_Wcq^Yd{)>?0YJQ;%>uPLOXf1Z>N~`~JHJ!^@D5kSXQ4ugnFZ>^`zH8CAiZmp
z6Ms|#2gcGsQ{{u7+Nb9sA?U>(0e$5V1|WVwY`Kn)rsnnZ4=1u=7u!4WexZD^IQ1Jk
zfF#NLe>W$3m&C<Judi^~2Jd~{D8jZ-m3<I?QHUG~oc2~GJ@x-nBoK@h4GcSLxGfsX
zfTdP+=13qQO!NU_uMh&%<XRtv_0a6}72WoHf#VTfqhb7)R+(a%=?T4o^!?D#Ac6^+
zXKeLSeCL7ISoGpHLi2eBVVW{_;UZ0m%OS;R_2V7Vs;8=uYc-)LBGghwH9Zu1Edt+b
zT^}79&kIY&N#S+q0I2h{D^vQZk5N28O2y<eE@o#5;KI7~zIO0DH7FNoNXR&XzubAB
ztYQ<csr+w+x=K`8G~U#&JD1GDQ60<LqUZufO;K($=noZL@LXLw%~5&4#b^`*&g2~U
z<3^4g1e??#E#^yo8^E-=I=nF1z^NNWj)tNkrW3(#0*44U#6*z{kwPr%f4C<3ok69B
zsr@mA4HSpOBtTrwMQi)Gj*865x(w;jhuIr)Ue*HmikShWv`DBtGAj9{&3k0VdY48S
z+YZO&yo1BtNhQDvmqGzy;~&S}phy625Jv|8IOR-3eQbc_afy=qy=|cc5<<8hEhBC%
zuWct|>^ULjdw+5|)-BSHwpegdyt9NYC{3@QtMfd8GrIWDu`gd0nv-3LpGCh@wgBaG
z176tikL!_NXM+Bv#7q^cyn9$XSeZR6#<HnyuRVd+K|W`3ILQ8$LF4+uY4&mX$W{#x
zu#si~$C=ovXgD-<_<;elHvd+vrclEER*zIZu0{1RxK<|EkW_xHjsv-B>!B4JE@GVH
zoo<m!UF_*7SK*!d!(q;|za&iL7JlU)TEGOGaM%tpjC3|!gdvPpQ{XrkGTL7``@EE2
zShcd)rM~&`1oKxUU1+u<>bHZN_*RF#@_SVYKkQ_igme-Y5U}cV(hkR#k1c{bQNMji
zU7aE`?dHyx=1`kOYZo_8U7?3-7vHOp`Qe%Z*i+FX!s?6huNp0iCEW-Z7E&jRWmUW_
z67j>)Ew!yq)hhG4o?^z}HWH-e=es#xJUhDRc4B51M<k=%yr}nRlwZh{3yHihxqRno
z$nCrF@gloq?NMAJRBy`0^RVxSLbE(c79Vft;5O2vBgas$@`@3JpdoMdD$sHCNZIl4
zx@1Q$6fbNBUQ1P}u`H$K=1CNvkwc2^KRb&!PDyEADc|GD66@wBPUUW#mk^(9@<{94
zo8Q9|#3X3ba>4~E-l5VZ!&zQq`gWe`?}#b~7w1LH4Xa-UCT5LXkXQWheBa2YJYbyQ
zl1pXR%b(KCXMO0OsXgl0P0Og<{(@&z1aokU-Pq`e<w28r6ESFC>Qq*JYgt8xdFQ6S
z6Z3IFSua8W&M#`~*L#r>Jfd6*BzJ?JFdBR#bDv$_0N!_5vnmo@!>vULcDm`MFU823
zpG9pqjqz^FE5zMDoGqhs5OMmC{Y3iVcl>F}5Rs24Y5B^mYQ;1T&ks@pIApHOdrzXF
z-SdX}Hf{X;TaSxG_T$0~#RhqKISGKNK47}0*x&nRIPtmdwxc&QT3$8&!3fWu1eZ_P
zJveQj^hJL#Sn!*4k<RKkGxZHPY@fG!i6S>`3}(d(aasl&7G0j0-*_2xtAnoX1@9+h
zO#c>YQg60Z;o{Bi=3i7S`Ic+ZE>K{(u|#)9y}q*j8uKQ1^>+(BI}m%1v3$=4ojGBc
zm+o1*!T&b}-lVvZqIUBc8V}QyFEgm#oyIuC{8WqUNV{Toz`oxhYpP!_p2oHH<H{!F
zJwbjb?7O`v1Cw^r|5cS4>h5P@iB*NVo~2=GQm+8Yrkm2Xjc_VyHg1c0>+o~@>*Qzo
zHVBJS>$$}$_4EniTI;b1WShX<5-p#TPB&!;lP!lBVBbLOOxh6FuYloD%m<kfPShB=
zMSXoayzt^$rSSi+wDW+5Yis*BBEi+`h%Qm0juIgV88UjW6B(lS-X%JNDAA)u)I@X<
zL5N<XgoFqYj85cg(IOJxnS1lThU<!Vea~8Bt(j##|Fcio=j>;n{r|;MU3<T=$+3Hj
z37gt__wHV6*TjAp<Mn*GeGRIp4C`HCj@^mpf`TFu$c#H>!q4AVkua~fiee<BD8eJ4
z8UhKS+0aRjbX;4|S?+I5=IXaUD%5=LT3d%a)9k(AAOEB+JlnEpq3kC{8f_1&_!pJf
z)$m}|@FJ*MnJ&4nI~T^f+1AtHPD@$%+CD`GqPq6d72$}xDwNPKsl$2{+g%gO*>Wu2
zQAQ$ue(IklX6+V;F1vCu-&V?I3d42FgWgsb_e^29ol}HYft?{SLf>DrmOp9o!t>I^
zY7fBCk+E8n_|apgM|-;^=#B?6RnFKlN`oR)`e$+;D=yO-(U^jV;rft^G_zl`n7qnM
z<xiQyn!Qt<2_mB8gx{p=cZ8gZZoWG6p|p`moI0#L{{r9qy=mR1aj{U(^P`0Bc2v>L
z*-Y4Phq+ZI1$j$F-f;`CD#|`-T~OM5Q>x}a>B~Gb3-+9i>Lfr|Ca6S^8g*{*?_5!x
zH_N!SoRP=gX1?)q%>QTY!r77e2j9W(I!uAz{T`NdNmPBBUzi2{`XMB^zJGGwFWeA9
z{fk33#*9SO0)DjROug+(M)I-pKA!CX;IY(#gE!UxXVsa)X!UftIN98{pt#4MJHOhY
zM$_l}-TJlxY?LS6Nuz1T<44m<4i^8k@<PPhprF+u6Qm1L98xdws3<<%x&_l|Bu=Cu
zA7~BERW~7&saLKF{j=Gi%Yd)FlXz11>D$zuCPrkmz@sdv+{ciyFJG2Zwy&<FJWP@F
z^ZRkG3{MleF*BpQ7;lg?#QcrW=T_C$rqI|QuO3Wy4dZ#Y;M26O#lYi8*Gx5KLf*41
z@hQBLn;1{BzhQHy`-=F809|6xXH^E_&$o&Q73cSSr)ucJQr``$kxjUJXZNq!-Dl9G
zeg^7LT)MTyngi+Boma;VaOIJciZBr2#p6DgW%n`5w%XJe*Q^kl1sEWtNfEYSY2vKI
zQcE`MzH0yQFM>%c7;atIeTdh<yu@ooO-X%KfiC=P>!a(R^QXnu1Oq1b42*OQFWnyQ
zWeQrdvP|w_idy53Wa<{QH^lFmEd+VlJkyiC>6B#s)F;w-{c;aKIm;Kp50HnA-o3lY
z9B~F$gJ@yYE#g#X&3ADx&tO+P_@mnQTz9gv30_sTsaGXkfNYXY{$(>*PEN3QL>I!k
zp)KibPhrfX3%Z$H6SY`rXGYS~143wZrG2;=FLj50+VM6soI~up_>fU(2Wl@{BRsMi
zO%sL3x?2l1cXTF)k&moNsHfQrQ+wu(gBt{sk#CU=UhrvJIncy@tJX5klLjgMn>~h=
zg|FR&;@eh|C7`>s_9c~0-{IAPV){l|Ts`i=)AW;d9&KPc3fMe<n?sqL(RS@HXUMm6
z=Ay&F%?}=oc5VksTNoOZ-7blGVGv1-nbYO5z=%2_^|xL)hykmt7*6yoIbs^@@ykdG
zW$*}baWS(qw*7~5kalz*;LAzUZlS#2st3)uKBCE`EL|L05zZ9I4pCq5d7c8SR=#2+
zT#WOKc<PoXnfPC>oTS%8@V~D8*h;&(^>yjT84MM}=%#LS7shLAuuj(0VAYoozhWjq
z4LEr?wUe2^WGwdTIgWBkDUJa>YP@5d9^Rs$kCXmMRxuF*YMVrn?0NFyPl}>`&dqZb
z<5eqR=ZG3>n2{6<aJ&`LlXW1C4w*KhV5y$#li)j-9%^jHYQPmmaQ~0AkbKH}?W=FY
z%Wu$*-{Y)xCHe}>v6BvJ`YBZeeTtB88TAY(x0a58EWyuf>+^|x8Qa6wA|1Nb_p|nA
zWWa}|z8a)--Wj`LqyFk_a3gN2>5{Rl_wbW?#by7&i*^hRknK%jwIH6=dQ8*-_{<S6
z!2;CQP&KxHudneP-y>*x0j^DUfMX0`|K@6C<|1cgZ~D(e5vBFFm;HTZF(<N$iUcVN
zJWLyVz{{SH#}hLGnCBr>!vT8=T$K+|F)x3kqzBV4-=p1V(lzi(<?hj2N2U?if1}+4
z4f$w%d;&@`FYf92w&k<pkTJ3Ub5<84so!wed)@S9b!>s7jdu0>LD#N=$Lk#3HkG!a
zIF<7>%B7sRNzJ66KrFV76J<2bdYhxll0y2^_rdG=I%AgW4~)1Nvz=$1UkE^J%BxLo
z+lUci`UcU062os*=`-j4IfSQA{w@y|3}Vk?i;&SSdh8n+$iHA#%ERL{;EpXl6u&8@
zzg}?hkEOUOJt?ZL=pWZFJ19mI1@P=$U5<lUhw%|e&e*&{I#wCL3dAXNGL6EFDtH5f
zbO`1LzFxB%<$7u;nDVEISXp{A-8L=$E1?$0J(8yo3+fu{TK84{mg}M};QJ!?7sDnA
zLp&Q)30rclzmK-XeEuOK!&fjZqQduZ*rhHhDI{LBJuz?1SCzHuJyBNx#jE_u%a7go
zz8R1?EXpD6Lc*rkI9u|sJ(l?XXjx38u$krjIi8NMP&y86DXe*pN$s_2ZY;{&26pV;
z)-_(Xgvq-E9b5M<n^I@HGqDhhzjk!auv?^5A#(2Qh(R>*Im1e_8Z${JsM>Ov?nh8Z
zP5QvI!{Jy@&BP48%P2{Jr_VgzW;P@7)M9n|lDT|Ep#}<nn`M;BJh$R(ED&D!efW8C
zNdQ~Xcg&=K24kFxYbJ{=67RJn+bl#Sn%qJ@{BUpcOKgVKxSA4WnCMtd<Qj-ofV%i&
zb0|9K6ckoj)0eEV$QN5?8AbxUxSu}bj$<ZF&GHPM+;?@Oz0JW37G&AV?Y0vxOEcbz
zW!3u}*Y9W%n&tCY-(gfmyLjrFUg=GaYbkICT;co$xhYedq`B8L&$jd^Ztp89-gT`n
zH90$>7C$&ud&6>C^5ZiwKIg2McPU(4jhM!BD@@L(Gd*Nu$ji(ljZ<{FIeW<jSU$J=
zIS+CFQ)U{kGf_}0`)1DMMFqbQ(e$5<B=Y{fwjh3&`XFKHNIPS`?N<>_1Mmf;76{LU
z-ywN~=uNN)Xi6$<12A9y)K%X|(W0p|&>>4OXB?IiYr||WKDOJPxiSe01NSV-h24^L
z_>m$;|C+q!Mj**-qQ$L-*++en(g|hw;M!^%_h-iDjFHLo-n3JpB;p?+o2;`*jpvJU
zLY^lt)Un4joij^^)O(CKs@7E%*!w>!HA4Q?0}oBJ7Nr8NQ7QmY^4~jvf0-`%waOLn
zdNjAPaC0_7c|RVhw)+71NWjRi!y>C+Bl;Z`NiL^zn2*0kmj5gyhCLCxts*cWCdRI|
zjsd=sT5BVJc^$GxP~YF$-U{-?kW6r@^vHXB%{CqYzU@1>dzf#3SYedJG-Rm6^RB7s
zGM5PR(yKPKR)>?~vpUIeTP7A1sc8-knnJk*9)3t^e%izbdm>Y=W{$wm(cy1RB-19i
za#828DMBY+ps#7Y8^6t)=Ea@%Nkt)O6JCx|ybC;Ap}Z@Zw~*}3P>MZLPb4Enxz9Wf
zssobT^(R@KuShj8>@!1<hFRAn#JTEe!9Hu`z2_XzT;Z-Q&S$+@u-JR;Zj&^Vr^?dh
z$7<RN^fP@on>M7tm|2%-pYYDxz-5`rCbaT<l<3X3bz-ff93}(sg17h0x>CG5{;Uxm
z<R+)KPwz@x+?&!U(P2jVfOU(NK0U9%gs*7~fXBNipS)MXGL3GOOXqZsO|{KqeVbKc
zxDkAPCAFw)PBdT{wkPM$OuZEZvY*y5FctRL^5`RSsU3Nqgj4G7!^i2*Xuk;|jwD_1
zP-xq>*g=+H1X8{NUvFGzz~wXa%Eo};I;~`37*WrRU&K0dPSB$yk(Z*@K&+mFal^?c
zurbqB-+|Kb5|sznT;?Pj!+kgFY1#Dr;_%A(GIQC{3ct|{*Bji%FNa6c-thbpBkA;U
zURV!Dr&X{0J}iht#-Qp2=xzuh(fM>zRoiGrYl5ttw2#r34gC41CCOC31m~^UPTK@s
z6;A@)7O7_%C)>bnAXerYuAHdE93>j2N}H${zEc6&SbZ|-fiG*-qtGuy-qDelH(|u$
zorf8_T6Zqe#Ub!+e3oSyrskt_HyW_^5lrWt#30l)tHk|j$@YyE<QW0E^u$@S_!}(s
zkeLYjM~DPk2B+1IlAY?HzL(R}L=r3EV3D0{v3ev@v1BJWNYbf;olbl@Tvc?ZTufpS
z$yN3_P}Qfh#b&kQOthf~oj3gz`0CRj$slFnPxjp7ihJ&m?Z2+5Ia2J`%czy(CtgvP
zj=!b;x}u<-W+raOc(3Vv`wI*6NS{m!M$<(^lhc1inZ_L-0M7L*2-8q$28${K<n#Cx
z5kV__+~q&Qzbmv+o>kXUOV;6B51L;M@=NIWZXU;GrAa(LGxO%|im%7F<-6N;en0Cr
zLH>l*y?pMwt`1*cH~LdBPFY_l;~`N!Clyfr;7w<^X;&(ZiVdF1S5e(+Q%60zgh)s4
zn2yj$+mE=miVERP(g8}G4<85^-5f@qxh2ec?n+$A_`?qN=iyT1?U@t?V6DM~BIlBB
z>u~eXm-aE>R0sQy!-I4xtCNi!!qh?R1!kKf6BoH2GG{L4%PAz0{Sh6xpuyI%*~u)s
z%rLuFl)uQUCBQAtMyN;%)zFMx4loh7uTfKeB2Xif`lN?2gq6NhWhfz0u5WP9J>=V2
zo{mLtS<Rsf#!58ros^ZkI6^}1k4#%VcPp>y&BA!mSzs&CrKWq^y40JF5a&GSXIi2=
z{EYb59J4}VwikL4P=>+mc6{($FNE@e=VUwG+KV21;<@lrN`mnz5jYGASyvz7BOG<h
z0BuiW66>_6(p^eTxD-4O#lROgon;R35=|nj#eHIf<BG_ttk251?l(w5IlkORQ$*=6
zij`YEa&ZwZMDGil!}OAQWqDmq#NO1Bw`*ihPDi<<FfOj|(-t?eDRgQkBP_G-1}ATD
zey5X#i1Ixn{gDe4vJWHVXU%7>JBYPWG>H<YmOU~GXj0@B7#vKpj;OI~Wm8A=CKzVR
zy-a))LmSP<t&pfkif>>`dHKCDZ3`R{-?HO0mE~(5_WYcFmp8sU?wr*UkAQiNDGc6T
zA%}GOLXlOWqL?WwfHO8MB#8M8*~Y*gz;1rWWoVSXP&IbKxbQ8+s%4Jnt?kDsq7btI
zCDr0PZ)b;B%!lu&CT#RJzm{l{2fq|BcY85`w~3LSK<><@(2EdzFLt9Y_`;WXL6x`0
zDoQ?=?I@Hbr;*VVll1Gmd8<V1aY2m9&0+(1II64#%zyIQ-?!ZD_r2QtqR5KztvgtQ
znnF}S+RUdm*|I67Gjhu_3K%sdJgwlo9MHvA#MF($3RRI~%WzkC)!+856v6E1lg(Vg
z#1%<Q{wA4n-ZDN(oes20o~wTe;-DkMkvf*+^vEgo{a1plD?EiPdj;mZ(44jTnzV-g
z@E`K}ir<%psNIz9AM!4)s;KLG#_sBB3=G8G^mU+HPWI(WkOYILDTxi53kjO`Cyc)1
zxY^yH$=sUUSp0BJ1R-oW4blpKC*ECFQ9WN#m{KG!^D@DGvRI1vbrnm;+$h7t7O_F?
z?lCgnSF)z~?UsxnB=mtD7b8-dc)UaQTc?6Hd?z@Iv&7Q4+n0?uP1Wg9Dm=TQz~1{!
zStY#il3#s232%ex@W|tDp{%UkKQ5MEU0|H*_>*%tiXggMK81a+T(5Gx6;eNb8=uYn
z5BG-0g>pP21NPn>$ntBh>`*})Fl|38oC^9Qz>~MAazH<hOt&qXU^z0ER*S;rL5Q5}
z5~uGLl6_AKLC4#$2@qqEvv=RH?y*Vj)UgEXDCbyE+C`@gvVI|P7JMEI33a3+XMpVl
zDNM+ya&c<o)B)UpMa+^F&?xEBVr0!ifNlVd)7pS;RP~mfyed{4FG(!y`hGlyi_uw5
ztF4uGLlZuV$fy?Kdmmv%HgpjV#*50_4fhhM7{sF^CJjZde3h;4$7ZNho3LWOkwMFC
zyCyVXc=zc<vkBEl?^>%3Q~Qb!ALMf$srexgPZ2@&c~+hxRi1;}+)-06)!#Mq<6GhP
z-Q?qmgo${aFBApb5p}$1OJKTClfi8%PpnczyVKkoHw7Ml9e7ikrF0d~UB}i3vizos
zXW4DN$SiEV9{faLt5bHy2a>33K%7Td-n5C*N;f&ZqAg#2hIqEb(y<&f4u5BWJ>2^4
z414GosL=Aom#m&=x_v<0-fp1r%oVJ{T-(xnomNJ(<D8_vMLEqL%zEb|ck8Wk>Dryv
zh?vj+%=II_nV+@NR+(!fZZVM&(W6{6%9cm+o+Z6}KqzLw{(>E86uA1`_K$HqINlb1
zKelh3-jr2I9V?ych`{hta9wQ2c<TM)3$`z!#*$hXGMy-2(+47CE-+UXuk#ip=^EgV
zLA4h?e&*MDwrK0BA!H{YHSn4wzxat`a{8{%(;Z^eAdvK?(Sjy$w`wCmJp*E5QD9JD
z;Nk)t9}H%UvZ@@0MM4aWdUgy965yV7IFzAU5FU9I8L*PPG*m?ss;zYv0~ksEGmYId
ziEGz^-z9+$#i2BOKt1ZeX_O%<@-k3OEna1re@zu{cn8J|h&Tct{zIv1fm9C87GR6N
z{CmJAwpL&?tPsFAce4XrO#z#FGsk0|RFAg2C5bG>9=MM`2cC{m6^MhlL2{DLv7C^j
z$xXBCnDl_;l|bPGMX@*tV)B!c|4oZyftUlP*?$YU9C_eAsuVHJ58?)zpbr30P*C`T
z7y#ao`uE-SOG(Pi+`$=e^mle~)pRrdwL5<!iB70TfxHjG`TQv)6;DHaJlafjtoY$(
zwlSSTQ`ySJ1z;Hby-R^J1@I+zHTz97(ecZNn;CrZ6q3KRPNtV1Z6-S57X@}ch(5Mc
zYyN#`Pt!yyG_vdA(-e8>)N;o{gpW21of(QE#U6w%*C~`v-z0QqBML!!5EeYA5IQB0
z^l0<Y>1c;L6E(iytN!LhL}wfwP7W9PNAkb+)Cst?qg#$n;z41O4&v+8-zPs+XNb-q
zIeeBCh#ivnFLUCwfS;p{LC0O7tm+Sf9Jn)~b%uwP{%69;QC)Ok0t%*a5M+=;y8j=v
z#!*pp$9@!x;UMIs4~hP#pnfVc!%-D<+wsG@R2+J&%73lK|2G!EQC)O<W|XP<L5#_r
ztovJw^P^JeW`Zcc=Y!x;I#KF3*Dbow9IC>05TCV=&3g)C!lT=czLpZ@Sa%TYuoE<X
z)gg}YuRAJ${=PM8N#;T1*&QqJpLeW}B0r8MMt}A9@ZOp6Ix+DHFK-{!K%Wpry+nKv
z<#$ig_|1VupVmUnrlLi}v1yN;TRpn5=yNrPyZP9tW3!$#L3T7bdL0-w-E$CR(Z?n~
z-Q>?v8T8`V;e$#Zf2_<YO3X(!(1$aqGTT9zJvd3@Uy5#Oif4hb5o#>Nj6nvBgh1)2
GZ~q4|mN%#X

literal 0
HcmV?d00001

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 000000000..df97d72b8
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,7 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
new file mode 100755
index 000000000..f5feea6d6
--- /dev/null
+++ b/gradlew
@@ -0,0 +1,252 @@
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+##############################################################################
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
+##############################################################################
+
+# Attempt to set APP_HOME
+
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
+done
+
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD=maximum
+
+warn () {
+    echo "$*"
+} >&2
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+} >&2
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD=$JAVA_HOME/jre/sh/java
+    else
+        JAVACMD=$JAVA_HOME/bin/java
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD=java
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+fi
+
+# Increase the maximum file descriptors if we can.
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
+fi
+
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
+exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
new file mode 100644
index 000000000..9d21a2183
--- /dev/null
+++ b/gradlew.bat
@@ -0,0 +1,94 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
+
+@if "%DEBUG%"=="" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if %ERRORLEVEL% equ 0 goto execute
+
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if %ERRORLEVEL% equ 0 goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/jdac/build.gradle.kts b/jdac/build.gradle.kts
new file mode 100644
index 000000000..aeacea987
--- /dev/null
+++ b/jdac/build.gradle.kts
@@ -0,0 +1,48 @@
+plugins {
+    `java-library`
+    `maven-publish`
+}
+
+repositories {
+    mavenLocal()
+    maven {
+        url = uri("https://repo.maven.apache.org/maven2/")
+    }
+}
+
+dependencies {
+    api(libs.net.dv8tion.jda)
+    api(libs.org.reflections.reflections)
+    api(libs.org.slf4j.slf4j.api)
+    api(libs.com.google.code.gson.gson)
+    api(libs.org.jetbrains.annotations)
+
+
+    testImplementation(libs.org.junit.jupiter.junit.jupiter.api)
+    testImplementation(libs.org.junit.jupiter.junit.jupiter.engine)
+}
+
+group = "com.github.kaktushose"
+version = "4.0.0-beta.3"
+description = "jda-commands"
+
+
+java.sourceCompatibility = JavaVersion.VERSION_23
+
+publishing {
+    publications.create<MavenPublication>("maven") {
+        from(components["java"])
+    }
+}
+
+tasks.withType<JavaCompile>() {
+    options.encoding = "UTF-8"
+}
+
+tasks.withType<Javadoc>() {
+    val options = options as StandardJavadocDocletOptions
+    options.encoding = "UTF-8"
+    options.tags("apiNote:a:API Note:", "implSpec:a:Implementation Requirements:", "implNote:a:Implementation Note:")
+    options.docFilesSubDirs(true)
+    options.overview = rootDir.path.plus("src/main/javadoc/overview.md")
+}
\ No newline at end of file
diff --git a/src/examples/BanCommand.java b/jdac/src/examples/BanCommand.java
similarity index 100%
rename from src/examples/BanCommand.java
rename to jdac/src/examples/BanCommand.java
diff --git a/src/examples/CookieClicker.java b/jdac/src/examples/CookieClicker.java
similarity index 100%
rename from src/examples/CookieClicker.java
rename to jdac/src/examples/CookieClicker.java
diff --git a/src/examples/Main.java b/jdac/src/examples/Main.java
similarity index 100%
rename from src/examples/Main.java
rename to jdac/src/examples/Main.java
diff --git a/src/examples/embeds.json b/jdac/src/examples/embeds.json
similarity index 100%
rename from src/examples/embeds.json
rename to jdac/src/examples/embeds.json
diff --git a/src/examples/scope/PremiumCommand.java b/jdac/src/examples/scope/PremiumCommand.java
similarity index 100%
rename from src/examples/scope/PremiumCommand.java
rename to jdac/src/examples/scope/PremiumCommand.java
diff --git a/src/examples/scope/PremiumGuildsProvider.java b/jdac/src/examples/scope/PremiumGuildsProvider.java
similarity index 100%
rename from src/examples/scope/PremiumGuildsProvider.java
rename to jdac/src/examples/scope/PremiumGuildsProvider.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/JDACommands.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/JDACommands.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/JDACommands.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/JDACommands.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/JDACommandsBuilder.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/JDACommandsBuilder.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/JDACommandsBuilder.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/JDACommandsBuilder.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/annotations/Implementation.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/Implementation.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/annotations/Implementation.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/Implementation.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/annotations/Inject.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/Inject.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/annotations/Inject.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/Inject.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/annotations/Produces.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/Produces.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/annotations/Produces.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/Produces.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/Constraint.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/Constraint.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/Constraint.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/Constraint.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/Max.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/Max.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/Max.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/Max.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/Min.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/Min.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/Min.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/Min.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/NotPerm.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/NotPerm.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/NotPerm.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/NotPerm.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/NotRole.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/NotRole.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/NotRole.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/NotRole.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/NotUser.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/NotUser.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/NotUser.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/NotUser.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/Perm.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/Perm.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/Perm.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/Perm.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/Role.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/Role.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/Role.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/Role.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/User.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/User.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/User.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/User.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/package-info.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/package-info.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/package-info.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/package-info.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/AutoComplete.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/AutoComplete.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/AutoComplete.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/AutoComplete.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Button.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Button.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Button.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Button.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Choices.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Choices.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Choices.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Choices.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/CommandScope.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/CommandScope.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/CommandScope.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/CommandScope.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/ContextCommand.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/ContextCommand.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/ContextCommand.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/ContextCommand.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Cooldown.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Cooldown.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Cooldown.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Cooldown.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/EntitySelectMenu.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/EntitySelectMenu.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/EntitySelectMenu.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/EntitySelectMenu.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Interaction.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Interaction.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Interaction.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Interaction.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Modal.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Modal.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Modal.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Modal.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Optional.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Optional.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Optional.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Optional.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Param.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Param.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Param.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Param.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Permissions.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Permissions.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Permissions.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Permissions.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/ReplyConfig.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/ReplyConfig.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/ReplyConfig.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/ReplyConfig.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/SelectOption.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/SelectOption.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/SelectOption.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/SelectOption.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/SlashCommand.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/SlashCommand.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/SlashCommand.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/SlashCommand.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/StringSelectMenu.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/StringSelectMenu.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/StringSelectMenu.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/StringSelectMenu.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/TextInput.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/TextInput.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/TextInput.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/TextInput.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/package-info.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/package-info.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/package-info.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/package-info.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/annotations/internal/SelectOptionContainer.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/internal/SelectOptionContainer.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/annotations/internal/SelectOptionContainer.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/internal/SelectOptionContainer.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/annotations/internal/package-info.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/internal/package-info.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/annotations/internal/package-info.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/internal/package-info.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/annotations/package-info.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/package-info.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/annotations/package-info.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/package-info.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/definitions/Definition.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/Definition.java
similarity index 97%
rename from src/main/java/com/github/kaktushose/jda/commands/definitions/Definition.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/Definition.java
index 354698689..399007747 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/definitions/Definition.java
+++ b/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/Definition.java
@@ -15,7 +15,7 @@ public sealed interface Definition permits CustomIdJDAEntity, Invokable, JDAEnti
         ModalDefinition.TextInputDefinition, OptionDataDefinition, OptionDataDefinition.ConstraintDefinition,
         SlashCommandDefinition.CooldownDefinition, StringSelectMenuDefinition.SelectOptionDefinition {
 
-    /// The id for this definition. Per default this is the hash code of the [#toString()] method.
+    /// The id for this definition. Per default this is the hash code of the [Object#toString()] method.
     @NotNull
     default String definitionId() {
         return String.valueOf(toString().hashCode());
diff --git a/src/main/java/com/github/kaktushose/jda/commands/definitions/description/ClassDescription.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/description/ClassDescription.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/definitions/description/ClassDescription.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/description/ClassDescription.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/definitions/description/ClassFinder.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/description/ClassFinder.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/definitions/description/ClassFinder.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/description/ClassFinder.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/definitions/description/Description.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/description/Description.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/definitions/description/Description.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/description/Description.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/definitions/description/Descriptor.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/description/Descriptor.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/definitions/description/Descriptor.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/description/Descriptor.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/definitions/description/Invoker.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/description/Invoker.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/definitions/description/Invoker.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/description/Invoker.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/definitions/description/MethodDescription.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/description/MethodDescription.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/definitions/description/MethodDescription.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/description/MethodDescription.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/definitions/description/ParameterDescription.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/description/ParameterDescription.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/definitions/description/ParameterDescription.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/description/ParameterDescription.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/definitions/description/package-info.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/description/package-info.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/definitions/description/package-info.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/description/package-info.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/definitions/description/reflective/ReflectiveClassFinder.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/description/reflective/ReflectiveClassFinder.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/definitions/description/reflective/ReflectiveClassFinder.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/description/reflective/ReflectiveClassFinder.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/definitions/description/reflective/ReflectiveDescriptor.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/description/reflective/ReflectiveDescriptor.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/definitions/description/reflective/ReflectiveDescriptor.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/description/reflective/ReflectiveDescriptor.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/definitions/description/reflective/package-info.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/description/reflective/package-info.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/definitions/description/reflective/package-info.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/description/reflective/package-info.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/definitions/features/CustomIdJDAEntity.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/features/CustomIdJDAEntity.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/definitions/features/CustomIdJDAEntity.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/features/CustomIdJDAEntity.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/definitions/features/JDAEntity.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/features/JDAEntity.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/definitions/features/JDAEntity.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/features/JDAEntity.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/definitions/features/internal/Invokable.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/features/internal/Invokable.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/definitions/features/internal/Invokable.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/features/internal/Invokable.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/definitions/features/package-info.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/features/package-info.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/definitions/features/package-info.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/features/package-info.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/AutoCompleteDefinition.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/AutoCompleteDefinition.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/AutoCompleteDefinition.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/AutoCompleteDefinition.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/CustomId.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/CustomId.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/CustomId.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/CustomId.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/InteractionDefinition.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/InteractionDefinition.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/InteractionDefinition.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/InteractionDefinition.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/InteractionRegistry.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/InteractionRegistry.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/InteractionRegistry.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/InteractionRegistry.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/MethodBuildContext.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/MethodBuildContext.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/MethodBuildContext.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/MethodBuildContext.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/ModalDefinition.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/ModalDefinition.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/ModalDefinition.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/ModalDefinition.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/CommandDefinition.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/CommandDefinition.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/CommandDefinition.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/CommandDefinition.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/ContextCommandDefinition.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/ContextCommandDefinition.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/ContextCommandDefinition.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/ContextCommandDefinition.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/OptionDataDefinition.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/OptionDataDefinition.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/OptionDataDefinition.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/OptionDataDefinition.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/SlashCommandDefinition.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/SlashCommandDefinition.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/SlashCommandDefinition.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/SlashCommandDefinition.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/package-info.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/package-info.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/package-info.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/package-info.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/ButtonDefinition.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/ButtonDefinition.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/ButtonDefinition.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/ButtonDefinition.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/ComponentDefinition.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/ComponentDefinition.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/ComponentDefinition.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/ComponentDefinition.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/menu/EntitySelectMenuDefinition.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/menu/EntitySelectMenuDefinition.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/menu/EntitySelectMenuDefinition.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/menu/EntitySelectMenuDefinition.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/menu/SelectMenuDefinition.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/menu/SelectMenuDefinition.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/menu/SelectMenuDefinition.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/menu/SelectMenuDefinition.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/menu/StringSelectMenuDefinition.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/menu/StringSelectMenuDefinition.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/menu/StringSelectMenuDefinition.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/menu/StringSelectMenuDefinition.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/menu/package-info.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/menu/package-info.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/menu/package-info.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/menu/package-info.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/package-info.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/package-info.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/package-info.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/package-info.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/package-info.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/package-info.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/package-info.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/package-info.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dependency/DefaultDependencyInjector.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/dependency/DefaultDependencyInjector.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/dependency/DefaultDependencyInjector.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/dependency/DefaultDependencyInjector.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dependency/DependencyInjector.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/dependency/DependencyInjector.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/dependency/DependencyInjector.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/dependency/DependencyInjector.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dependency/package-info.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/dependency/package-info.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/dependency/package-info.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/dependency/package-info.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/JDAEventListener.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/JDAEventListener.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/dispatching/JDAEventListener.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/JDAEventListener.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/Runtime.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/Runtime.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/dispatching/Runtime.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/Runtime.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/TypeAdapter.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/TypeAdapter.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/TypeAdapter.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/TypeAdapter.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/AudioChannelAdapter.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/AudioChannelAdapter.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/AudioChannelAdapter.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/AudioChannelAdapter.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/BooleanAdapter.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/BooleanAdapter.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/BooleanAdapter.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/BooleanAdapter.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/ByteAdapter.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/ByteAdapter.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/ByteAdapter.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/ByteAdapter.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/CharacterAdapter.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/CharacterAdapter.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/CharacterAdapter.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/CharacterAdapter.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/DoubleAdapter.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/DoubleAdapter.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/DoubleAdapter.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/DoubleAdapter.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/FloatAdapter.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/FloatAdapter.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/FloatAdapter.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/FloatAdapter.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/GuildChannelAdapter.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/GuildChannelAdapter.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/GuildChannelAdapter.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/GuildChannelAdapter.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/GuildMessageChannelAdapter.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/GuildMessageChannelAdapter.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/GuildMessageChannelAdapter.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/GuildMessageChannelAdapter.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/IntegerAdapter.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/IntegerAdapter.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/IntegerAdapter.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/IntegerAdapter.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/LongAdapter.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/LongAdapter.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/LongAdapter.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/LongAdapter.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/MemberAdapter.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/MemberAdapter.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/MemberAdapter.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/MemberAdapter.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/NewsChannelAdapter.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/NewsChannelAdapter.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/NewsChannelAdapter.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/NewsChannelAdapter.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/RoleAdapter.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/RoleAdapter.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/RoleAdapter.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/RoleAdapter.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/ShortAdapter.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/ShortAdapter.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/ShortAdapter.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/ShortAdapter.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/StageChannelAdapter.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/StageChannelAdapter.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/StageChannelAdapter.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/StageChannelAdapter.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/TextChannelAdapter.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/TextChannelAdapter.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/TextChannelAdapter.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/TextChannelAdapter.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/ThreadChannelAdapter.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/ThreadChannelAdapter.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/ThreadChannelAdapter.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/ThreadChannelAdapter.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/UserAdapter.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/UserAdapter.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/UserAdapter.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/UserAdapter.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/VoiceChannelAdapter.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/VoiceChannelAdapter.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/VoiceChannelAdapter.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/VoiceChannelAdapter.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/package-info.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/package-info.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/package-info.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/package-info.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/internal/TypeAdapters.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/internal/TypeAdapters.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/internal/TypeAdapters.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/internal/TypeAdapters.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/package-info.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/package-info.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/package-info.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/package-info.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/context/InvocationContext.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/context/InvocationContext.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/dispatching/context/InvocationContext.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/context/InvocationContext.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/context/KeyValueStore.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/context/KeyValueStore.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/dispatching/context/KeyValueStore.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/context/KeyValueStore.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/Event.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/Event.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/dispatching/events/Event.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/Event.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/ModalReplyableEvent.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/ModalReplyableEvent.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/dispatching/events/ModalReplyableEvent.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/ModalReplyableEvent.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/ReplyableEvent.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/ReplyableEvent.java
similarity index 98%
rename from src/main/java/com/github/kaktushose/jda/commands/dispatching/events/ReplyableEvent.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/ReplyableEvent.java
index c4817cde3..4bf377eae 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/ReplyableEvent.java
+++ b/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/ReplyableEvent.java
@@ -109,8 +109,8 @@ public SelectMenu getSelectMenu(@NotNull String menu) {
     ///
     /// Returns a new [ConfigurableReply] that can be used to append components or override reply settings.
     ///
-    /// @return [ConfigurableReply]
-    /// @see [ConfigurableReply]
+    /// @return a new [ConfigurableReply]
+    /// @see ConfigurableReply
     @NotNull
     public ConfigurableReply with() {
         return new ConfigurableReply(newReply(), registry, runtimeId());
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/interactions/AutoCompleteEvent.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/interactions/AutoCompleteEvent.java
similarity index 98%
rename from src/main/java/com/github/kaktushose/jda/commands/dispatching/events/interactions/AutoCompleteEvent.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/interactions/AutoCompleteEvent.java
index 8c6a03a5f..e5afe1831 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/interactions/AutoCompleteEvent.java
+++ b/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/interactions/AutoCompleteEvent.java
@@ -10,7 +10,6 @@
 import net.dv8tion.jda.api.interactions.commands.build.OptionData;
 import org.jetbrains.annotations.NotNull;
 
-import javax.annotation.Nonnull;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.stream.Collectors;
@@ -83,7 +82,7 @@ public void replyChoices(@NotNull Command.Choice... choices) {
      *                                  <li>If the string value of any of the choices is empty or longer than {@value OptionData#MAX_CHOICE_VALUE_LENGTH}</li>
      *                                  </ul>
      */
-    public void replyChoice(@Nonnull String name, @Nonnull String value) {
+    public void replyChoice(@NotNull String name, @NotNull String value) {
         replyChoices(new Command.Choice(name, value));
     }
 
@@ -244,7 +243,7 @@ public String getName() {
     /// The query value that the user is currently typing.
     ///
     /// This is not validated and may not be a valid value for an actual command.
-    /// For instance, a user may input invalid numbers for [#NUMBER].
+    /// For instance, a user may input invalid numbers for [OptionType#NUMBER].
     ///
     /// @return The current auto-completable query value
     @NotNull
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/interactions/CommandEvent.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/interactions/CommandEvent.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/dispatching/events/interactions/CommandEvent.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/interactions/CommandEvent.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/interactions/ComponentEvent.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/interactions/ComponentEvent.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/dispatching/events/interactions/ComponentEvent.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/interactions/ComponentEvent.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/interactions/ModalEvent.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/interactions/ModalEvent.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/dispatching/events/interactions/ModalEvent.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/interactions/ModalEvent.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/interactions/package-info.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/interactions/package-info.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/dispatching/events/interactions/package-info.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/interactions/package-info.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/package-info.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/package-info.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/dispatching/events/package-info.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/package-info.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/expiration/ExpirationStrategy.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/expiration/ExpirationStrategy.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/dispatching/expiration/ExpirationStrategy.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/expiration/ExpirationStrategy.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/AutoCompleteHandler.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/AutoCompleteHandler.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/AutoCompleteHandler.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/AutoCompleteHandler.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/ComponentHandler.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/ComponentHandler.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/ComponentHandler.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/ComponentHandler.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/DispatchingContext.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/DispatchingContext.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/DispatchingContext.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/DispatchingContext.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/EventHandler.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/EventHandler.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/EventHandler.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/EventHandler.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/ModalHandler.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/ModalHandler.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/ModalHandler.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/ModalHandler.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/command/ContextCommandHandler.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/command/ContextCommandHandler.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/command/ContextCommandHandler.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/command/ContextCommandHandler.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/command/SlashCommandHandler.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/command/SlashCommandHandler.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/command/SlashCommandHandler.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/command/SlashCommandHandler.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/command/package-info.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/command/package-info.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/command/package-info.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/command/package-info.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/package-info.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/package-info.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/package-info.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/package-info.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/Middleware.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/Middleware.java
similarity index 92%
rename from src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/Middleware.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/Middleware.java
index 47d1629ee..1d67a8764 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/Middleware.java
+++ b/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/Middleware.java
@@ -16,7 +16,7 @@
 @FunctionalInterface
 public interface Middleware extends Consumer<InvocationContext<?>> {
 
-    /// Executes this middleware with the given [InvocationContext]. Use [#cancel(MessageCreateData)] to cancel the execution chain.
+    /// Executes this middleware with the given [InvocationContext]. Use [InvocationContext#cancel(MessageCreateData)] to cancel the execution chain.
     ///
     /// @param context the [InvocationContext] of the current interaction event
     void accept(InvocationContext<?> context);
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/Priority.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/Priority.java
similarity index 86%
rename from src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/Priority.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/Priority.java
index 02bd02046..bacca6c40 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/Priority.java
+++ b/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/Priority.java
@@ -2,7 +2,7 @@
 
 /// Enum to define with witch priority a [Middleware] should be executed.
 ///
-/// @see MiddlewareRegistry
+/// @see com.github.kaktushose.jda.commands.dispatching.middleware.internal.Middlewares
 // !! order matters, because enums are compared by ordinal number (java.lang.Comparable)
 public enum Priority {
     /// Middlewares with priority PERMISSIONS will always be executed first
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/ConstraintMiddleware.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/ConstraintMiddleware.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/ConstraintMiddleware.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/ConstraintMiddleware.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/CooldownMiddleware.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/CooldownMiddleware.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/CooldownMiddleware.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/CooldownMiddleware.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/PermissionsMiddleware.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/PermissionsMiddleware.java
similarity index 92%
rename from src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/PermissionsMiddleware.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/PermissionsMiddleware.java
index 179f26135..3f939e512 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/PermissionsMiddleware.java
+++ b/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/PermissionsMiddleware.java
@@ -15,9 +15,9 @@
 /// A [Middleware] implementation that will check permissions.
 /// The default implementation can only handle discord permissions. However, the [PermissionsProvider] can be
 /// used for own implementations.
-/// This filter will first check against [#hasPermission(User,InvocationContext)] with a
+/// This filter will first check against [PermissionsProvider#hasPermission(User,InvocationContext)] with a
 /// [User] object. This can be used for global permissions. Afterward
-/// [#hasPermission(User,InvocationContext)] will be called. Since the [Member] is
+/// [PermissionsProvider#hasPermission(User,InvocationContext)] will be called. Since the [Member] is
 /// available this might be used for guild related permissions.
 ///
 /// @see Permissions
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/package-info.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/package-info.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/package-info.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/package-info.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/internal/Middlewares.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/internal/Middlewares.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/internal/Middlewares.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/internal/Middlewares.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/package-info.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/package-info.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/package-info.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/package-info.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/package-info.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/package-info.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/dispatching/package-info.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/package-info.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/Component.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/Component.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/Component.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/Component.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/ComponentReply.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/ComponentReply.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/ComponentReply.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/ComponentReply.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/ConfigurableReply.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/ConfigurableReply.java
similarity index 94%
rename from src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/ConfigurableReply.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/ConfigurableReply.java
index d6774a556..ffbf8b055 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/ConfigurableReply.java
+++ b/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/ConfigurableReply.java
@@ -1,5 +1,6 @@
 package com.github.kaktushose.jda.commands.dispatching.reply;
 
+import com.github.kaktushose.jda.commands.JDACommandsBuilder;
 import com.github.kaktushose.jda.commands.annotations.interactions.ReplyConfig;
 import com.github.kaktushose.jda.commands.definitions.interactions.CustomId;
 import com.github.kaktushose.jda.commands.definitions.interactions.InteractionDefinition;
@@ -67,7 +68,7 @@ public ConfigurableReply(@NotNull ConfigurableReply reply) {
     /// - Cannot be reacted to
     /// - Cannot be retrieved
     ///
-    /// **This will override both [GlobalReplyConfig] and any [ReplyConfig] annotation!**
+    /// **This will override both [JDACommandsBuilder#globalReplyConfig(InteractionDefinition.ReplyConfig)] and any [ReplyConfig] annotation!**
     ///
     /// @param ephemeral `true` if to send ephemeral replies
     /// @return the current instance for fluent interface
@@ -82,7 +83,7 @@ public ConfigurableReply ephemeral(boolean ephemeral) {
     /// More formally, if editing a message and `keepComponents` is `true`, the original message will first be queried and
     /// its components get added to the reply before it is sent.
     ///
-    /// **This will override both [GlobalReplyConfig] and any [ReplyConfig] annotation!**
+    /// **This will override both [JDACommandsBuilder#globalReplyConfig(InteractionDefinition.ReplyConfig)] and any [ReplyConfig] annotation!**
     ///
     /// @param editReply `true` if to keep the original components
     /// @return the current instance for fluent interface
@@ -99,7 +100,7 @@ public ConfigurableReply editReply(boolean editReply) {
     ///
     /// Subsequent replies to the same slash command event or the button event cannot be edited.
     ///
-    /// **This will override both [GlobalReplyConfig] and any [ReplyConfig] annotation!**
+    /// **This will override both [JDACommandsBuilder#globalReplyConfig(InteractionDefinition.ReplyConfig)] and any [ReplyConfig] annotation!**
     ///
     /// @param keepComponents `true` if to edit the original method
     /// @return the current instance for fluent interface
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/MessageReply.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/MessageReply.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/MessageReply.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/MessageReply.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/Reply.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/Reply.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/Reply.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/Reply.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/package-info.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/package-info.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/package-info.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/package-info.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/Validator.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/Validator.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/Validator.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/Validator.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/MaximumValidator.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/MaximumValidator.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/MaximumValidator.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/MaximumValidator.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/MinimumValidator.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/MinimumValidator.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/MinimumValidator.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/MinimumValidator.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/NotPermissionValidator.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/NotPermissionValidator.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/NotPermissionValidator.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/NotPermissionValidator.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/NotRoleValidator.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/NotRoleValidator.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/NotRoleValidator.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/NotRoleValidator.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/NotUserValidator.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/NotUserValidator.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/NotUserValidator.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/NotUserValidator.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/PermissionValidator.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/PermissionValidator.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/PermissionValidator.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/PermissionValidator.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/RoleValidator.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/RoleValidator.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/RoleValidator.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/RoleValidator.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/UserValidator.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/UserValidator.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/UserValidator.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/UserValidator.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/package-info.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/package-info.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/package-info.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/package-info.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/internal/Validators.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/internal/Validators.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/internal/Validators.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/internal/Validators.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/package-info.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/package-info.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/package-info.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/package-info.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/embeds/EmbedCache.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/embeds/EmbedCache.java
similarity index 96%
rename from src/main/java/com/github/kaktushose/jda/commands/embeds/EmbedCache.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/embeds/EmbedCache.java
index 4543453f6..2294b2f8b 100644
--- a/src/main/java/com/github/kaktushose/jda/commands/embeds/EmbedCache.java
+++ b/jdac/src/main/java/com/github/kaktushose/jda/commands/embeds/EmbedCache.java
@@ -5,10 +5,10 @@
 import com.google.gson.JsonSyntaxException;
 import com.google.gson.reflect.TypeToken;
 import com.google.gson.stream.JsonReader;
+import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.annotation.Nonnull;
 import java.io.*;
 import java.lang.reflect.Type;
 import java.util.List;
@@ -83,7 +83,7 @@ public void loadEmbeds() {
     ///
     /// @param name the name the [EmbedDTO] is mapped to
     /// @return the [EmbedDTO] or `null` if the cache contains no mapping for the key
-    public EmbedDTO getEmbed(@Nonnull String name) {
+    public EmbedDTO getEmbed(@NotNull String name) {
         return new EmbedDTO(embedMap.get(name));
     }
 
@@ -105,7 +105,7 @@ public int size() {
     ///
     /// @param name the name the [EmbedDTO] is mapped to
     /// @return `true` if this cache contains a mapping for the specified name.
-    public boolean containsEmbed(@Nonnull String name) {
+    public boolean containsEmbed(@NotNull String name) {
         return embedMap.containsKey(name);
     }
 
diff --git a/src/main/java/com/github/kaktushose/jda/commands/embeds/EmbedDTO.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/embeds/EmbedDTO.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/embeds/EmbedDTO.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/embeds/EmbedDTO.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/embeds/error/DefaultErrorMessageFactory.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/embeds/error/DefaultErrorMessageFactory.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/embeds/error/DefaultErrorMessageFactory.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/embeds/error/DefaultErrorMessageFactory.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/embeds/error/ErrorMessageFactory.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/embeds/error/ErrorMessageFactory.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/embeds/error/ErrorMessageFactory.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/embeds/error/ErrorMessageFactory.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/embeds/error/JsonErrorMessageFactory.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/embeds/error/JsonErrorMessageFactory.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/embeds/error/JsonErrorMessageFactory.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/embeds/error/JsonErrorMessageFactory.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/embeds/error/package-info.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/embeds/error/package-info.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/embeds/error/package-info.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/embeds/error/package-info.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/embeds/package-info.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/embeds/package-info.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/embeds/package-info.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/embeds/package-info.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/internal/Helpers.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/internal/Helpers.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/internal/Helpers.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/internal/Helpers.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/internal/JDAContext.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/internal/JDAContext.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/internal/JDAContext.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/internal/JDAContext.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/internal/register/CommandTree.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/internal/register/CommandTree.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/internal/register/CommandTree.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/internal/register/CommandTree.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/internal/register/SlashCommandUpdater.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/internal/register/SlashCommandUpdater.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/internal/register/SlashCommandUpdater.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/internal/register/SlashCommandUpdater.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/internal/register/TreeNode.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/internal/register/TreeNode.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/internal/register/TreeNode.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/internal/register/TreeNode.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/package-info.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/package-info.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/package-info.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/package-info.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/permissions/DefaultPermissionsProvider.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/permissions/DefaultPermissionsProvider.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/permissions/DefaultPermissionsProvider.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/permissions/DefaultPermissionsProvider.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/permissions/PermissionsProvider.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/permissions/PermissionsProvider.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/permissions/PermissionsProvider.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/permissions/PermissionsProvider.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/permissions/package-info.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/permissions/package-info.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/permissions/package-info.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/permissions/package-info.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/scope/DefaultGuildScopeProvider.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/scope/DefaultGuildScopeProvider.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/scope/DefaultGuildScopeProvider.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/scope/DefaultGuildScopeProvider.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/scope/GuildScopeProvider.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/scope/GuildScopeProvider.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/scope/GuildScopeProvider.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/scope/GuildScopeProvider.java
diff --git a/src/main/java/com/github/kaktushose/jda/commands/scope/package-info.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/scope/package-info.java
similarity index 100%
rename from src/main/java/com/github/kaktushose/jda/commands/scope/package-info.java
rename to jdac/src/main/java/com/github/kaktushose/jda/commands/scope/package-info.java
diff --git a/src/main/java/module-info.java b/jdac/src/main/java/module-info.java
similarity index 99%
rename from src/main/java/module-info.java
rename to jdac/src/main/java/module-info.java
index 96ae27f06..aeee8be3b 100644
--- a/src/main/java/module-info.java
+++ b/jdac/src/main/java/module-info.java
@@ -1,7 +1,6 @@
 /// The base module of jda-commands
 module jda.commands {
     requires com.google.gson;
-    requires jsr305;
     requires net.dv8tion.jda;
     requires transitive org.jetbrains.annotations;
     requires org.reflections;
diff --git a/src/main/javadoc/doc-files/flowchart.png b/jdac/src/main/javadoc/doc-files/flowchart.png
similarity index 100%
rename from src/main/javadoc/doc-files/flowchart.png
rename to jdac/src/main/javadoc/doc-files/flowchart.png
diff --git a/src/main/javadoc/overview.md b/jdac/src/main/javadoc/overview.md
similarity index 100%
rename from src/main/javadoc/overview.md
rename to jdac/src/main/javadoc/overview.md
diff --git a/src/test/java/adapting/CustomType.java b/jdac/src/test/java/adapting/CustomType.java
similarity index 100%
rename from src/test/java/adapting/CustomType.java
rename to jdac/src/test/java/adapting/CustomType.java
diff --git a/src/test/java/adapting/CustomTypeAdapter.java b/jdac/src/test/java/adapting/CustomTypeAdapter.java
similarity index 100%
rename from src/test/java/adapting/CustomTypeAdapter.java
rename to jdac/src/test/java/adapting/CustomTypeAdapter.java
diff --git a/src/test/java/adapting/TypeAdapterRegistryTest.java b/jdac/src/test/java/adapting/TypeAdapterRegistryTest.java
similarity index 100%
rename from src/test/java/adapting/TypeAdapterRegistryTest.java
rename to jdac/src/test/java/adapting/TypeAdapterRegistryTest.java
diff --git a/src/test/java/adapting/TypeAdapterTest.java b/jdac/src/test/java/adapting/TypeAdapterTest.java
similarity index 100%
rename from src/test/java/adapting/TypeAdapterTest.java
rename to jdac/src/test/java/adapting/TypeAdapterTest.java
diff --git a/src/test/java/adapting/mock/CacheRestActionMock.java b/jdac/src/test/java/adapting/mock/CacheRestActionMock.java
similarity index 100%
rename from src/test/java/adapting/mock/CacheRestActionMock.java
rename to jdac/src/test/java/adapting/mock/CacheRestActionMock.java
diff --git a/src/test/java/adapting/mock/GuildMock.java b/jdac/src/test/java/adapting/mock/GuildMock.java
similarity index 100%
rename from src/test/java/adapting/mock/GuildMock.java
rename to jdac/src/test/java/adapting/mock/GuildMock.java
diff --git a/src/test/java/adapting/mock/JDACommandsMock.java b/jdac/src/test/java/adapting/mock/JDACommandsMock.java
similarity index 100%
rename from src/test/java/adapting/mock/JDACommandsMock.java
rename to jdac/src/test/java/adapting/mock/JDACommandsMock.java
diff --git a/src/test/java/adapting/mock/JDAMock.java b/jdac/src/test/java/adapting/mock/JDAMock.java
similarity index 100%
rename from src/test/java/adapting/mock/JDAMock.java
rename to jdac/src/test/java/adapting/mock/JDAMock.java
diff --git a/src/test/java/adapting/mock/MemberMock.java b/jdac/src/test/java/adapting/mock/MemberMock.java
similarity index 100%
rename from src/test/java/adapting/mock/MemberMock.java
rename to jdac/src/test/java/adapting/mock/MemberMock.java
diff --git a/src/test/java/adapting/mock/RestActionMock.java b/jdac/src/test/java/adapting/mock/RestActionMock.java
similarity index 100%
rename from src/test/java/adapting/mock/RestActionMock.java
rename to jdac/src/test/java/adapting/mock/RestActionMock.java
diff --git a/src/test/java/adapting/mock/RoleMock.java b/jdac/src/test/java/adapting/mock/RoleMock.java
similarity index 100%
rename from src/test/java/adapting/mock/RoleMock.java
rename to jdac/src/test/java/adapting/mock/RoleMock.java
diff --git a/src/test/java/adapting/mock/SlashCommandInteractionEventMock.java b/jdac/src/test/java/adapting/mock/SlashCommandInteractionEventMock.java
similarity index 100%
rename from src/test/java/adapting/mock/SlashCommandInteractionEventMock.java
rename to jdac/src/test/java/adapting/mock/SlashCommandInteractionEventMock.java
diff --git a/src/test/java/adapting/mock/SlashCommandInteractionMock.java b/jdac/src/test/java/adapting/mock/SlashCommandInteractionMock.java
similarity index 100%
rename from src/test/java/adapting/mock/SlashCommandInteractionMock.java
rename to jdac/src/test/java/adapting/mock/SlashCommandInteractionMock.java
diff --git a/src/test/java/adapting/mock/TextChannelMock.java b/jdac/src/test/java/adapting/mock/TextChannelMock.java
similarity index 100%
rename from src/test/java/adapting/mock/TextChannelMock.java
rename to jdac/src/test/java/adapting/mock/TextChannelMock.java
diff --git a/src/test/java/adapting/mock/TypeAdapterRegistryTestController.java b/jdac/src/test/java/adapting/mock/TypeAdapterRegistryTestController.java
similarity index 100%
rename from src/test/java/adapting/mock/TypeAdapterRegistryTestController.java
rename to jdac/src/test/java/adapting/mock/TypeAdapterRegistryTestController.java
diff --git a/src/test/java/adapting/mock/UserMock.java b/jdac/src/test/java/adapting/mock/UserMock.java
similarity index 100%
rename from src/test/java/adapting/mock/UserMock.java
rename to jdac/src/test/java/adapting/mock/UserMock.java
diff --git a/src/test/java/commands/CommandDefinitionTestController.java b/jdac/src/test/java/commands/CommandDefinitionTestController.java
similarity index 100%
rename from src/test/java/commands/CommandDefinitionTestController.java
rename to jdac/src/test/java/commands/CommandDefinitionTestController.java
diff --git a/src/test/java/commands/SlashCommandDefinitionTest.java b/jdac/src/test/java/commands/SlashCommandDefinitionTest.java
similarity index 100%
rename from src/test/java/commands/SlashCommandDefinitionTest.java
rename to jdac/src/test/java/commands/SlashCommandDefinitionTest.java
diff --git a/src/test/java/commands/UnsupportedType.java b/jdac/src/test/java/commands/UnsupportedType.java
similarity index 100%
rename from src/test/java/commands/UnsupportedType.java
rename to jdac/src/test/java/commands/UnsupportedType.java
diff --git a/src/test/java/dependency/Dependency.java b/jdac/src/test/java/dependency/Dependency.java
similarity index 100%
rename from src/test/java/dependency/Dependency.java
rename to jdac/src/test/java/dependency/Dependency.java
diff --git a/src/test/java/dependency/DependencyInjectorTest.java b/jdac/src/test/java/dependency/DependencyInjectorTest.java
similarity index 100%
rename from src/test/java/dependency/DependencyInjectorTest.java
rename to jdac/src/test/java/dependency/DependencyInjectorTest.java
diff --git a/src/test/java/dependency/InjectableClass.java b/jdac/src/test/java/dependency/InjectableClass.java
similarity index 100%
rename from src/test/java/dependency/InjectableClass.java
rename to jdac/src/test/java/dependency/InjectableClass.java
diff --git a/src/test/java/dependency/ProducingClass.java b/jdac/src/test/java/dependency/ProducingClass.java
similarity index 100%
rename from src/test/java/dependency/ProducingClass.java
rename to jdac/src/test/java/dependency/ProducingClass.java
diff --git a/src/test/java/dependency/WrongProducingClass.java b/jdac/src/test/java/dependency/WrongProducingClass.java
similarity index 100%
rename from src/test/java/dependency/WrongProducingClass.java
rename to jdac/src/test/java/dependency/WrongProducingClass.java
diff --git a/src/test/java/parameters/OptionDataDefinitionTest.java b/jdac/src/test/java/parameters/OptionDataDefinitionTest.java
similarity index 100%
rename from src/test/java/parameters/OptionDataDefinitionTest.java
rename to jdac/src/test/java/parameters/OptionDataDefinitionTest.java
diff --git a/src/test/java/parameters/ParameterTestController.java b/jdac/src/test/java/parameters/ParameterTestController.java
similarity index 100%
rename from src/test/java/parameters/ParameterTestController.java
rename to jdac/src/test/java/parameters/ParameterTestController.java
diff --git a/src/test/java/reply/CustomController.java b/jdac/src/test/java/reply/CustomController.java
similarity index 100%
rename from src/test/java/reply/CustomController.java
rename to jdac/src/test/java/reply/CustomController.java
diff --git a/src/test/java/reply/DefaultController.java b/jdac/src/test/java/reply/DefaultController.java
similarity index 100%
rename from src/test/java/reply/DefaultController.java
rename to jdac/src/test/java/reply/DefaultController.java
diff --git a/src/test/java/reply/ReplyConfigTest.java b/jdac/src/test/java/reply/ReplyConfigTest.java
similarity index 100%
rename from src/test/java/reply/ReplyConfigTest.java
rename to jdac/src/test/java/reply/ReplyConfigTest.java
diff --git a/pom.xml b/pom.xml.old
similarity index 100%
rename from pom.xml
rename to pom.xml.old
diff --git a/settings.gradle.kts b/settings.gradle.kts
new file mode 100644
index 000000000..d176026f2
--- /dev/null
+++ b/settings.gradle.kts
@@ -0,0 +1,8 @@
+/*
+ * This file was generated by the Gradle 'init' task.
+ *
+ * This project uses @Incubating APIs which are subject to change.
+ */
+
+rootProject.name = "jda-commands"
+include("jdac")

From c415b769e4d7fa589dee8e8837dccdae9fceaea1 Mon Sep 17 00:00:00 2001
From: Nick Hensel <nickhensel25@icloud.com>
Date: Sat, 11 Jan 2025 14:09:25 +0100
Subject: [PATCH 29/38] Fix docs and ci

---
 .github/workflows/ci.yml       |  2 +-
 .github/workflows/coverage.yml |  4 ++--
 .github/workflows/javadocs.yml |  4 ++--
 .gitignore                     |  2 +-
 jdac/build.gradle.kts          | 41 +++++++++++++++++++++++++++-------
 5 files changed, 39 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 516aef305..59d761447 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -17,4 +17,4 @@ jobs:
           distribution: 'temurin'
           java-version: '23'
       - name: Build with Maven
-        run: mvn -B package --file pom.xml
+        run: gradle build
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
index 587533b07..f97ab3707 100644
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -16,9 +16,9 @@ jobs:
           distribution: 'temurin'
           java-version: '23'
       - name: Run Tests
-        run: mvn -B test
+        run: gradle test
       - name: Run codacy-coverage-reporter
         uses: codacy/codacy-coverage-reporter-action@v1
         with:
           project-token: ${{ secrets.CODACY_PROJECT_TOKEN }}
-          coverage-reports: target/site/jacoco/jacoco.xml
+          coverage-reports: jdac/build/reports/jacoco/test/jacocoTestReport.xml
diff --git a/.github/workflows/javadocs.yml b/.github/workflows/javadocs.yml
index d93548e17..89aacdfb1 100644
--- a/.github/workflows/javadocs.yml
+++ b/.github/workflows/javadocs.yml
@@ -23,7 +23,7 @@ jobs:
           java-version: '23'
       - name: Generate Documentation
         run: |
-          mvn javadoc:aggregate
+          gradle javadoc
       - name: Find target directory
         id: target_dir
         run: |
@@ -42,6 +42,6 @@ jobs:
         if: ${{ steps.target_dir.outputs.name != 'ignore' }}
         uses: JamesIves/github-pages-deploy-action@v4
         with:
-          folder: ./target/site/apidocs
+          folder: ./jdac/build/docs/javadoc
           branch: docs
           target-folder: javadocs/${{ steps.target_dir.outputs.name }}
diff --git a/.gitignore b/.gitignore
index 55045128b..d21592d3b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,7 +3,7 @@
 /guilds.json
 migration.md
 target/
-src/main/java/testing
+**/testing
 src/main/resources
 /logs
 .direnv
diff --git a/jdac/build.gradle.kts b/jdac/build.gradle.kts
index aeacea987..808342154 100644
--- a/jdac/build.gradle.kts
+++ b/jdac/build.gradle.kts
@@ -1,6 +1,7 @@
 plugins {
     `java-library`
     `maven-publish`
+    jacoco
 }
 
 repositories {
@@ -26,23 +27,47 @@ group = "com.github.kaktushose"
 version = "4.0.0-beta.3"
 description = "jda-commands"
 
-
-java.sourceCompatibility = JavaVersion.VERSION_23
-
 publishing {
     publications.create<MavenPublication>("maven") {
         from(components["java"])
     }
 }
 
-tasks.withType<JavaCompile>() {
-    options.encoding = "UTF-8"
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(23)
+    }
 }
 
-tasks.withType<Javadoc>() {
+tasks.test {
+    useJUnitPlatform()
+
+    finalizedBy(tasks.jacocoTestReport) // report is always generated after tests run
+}
+
+
+tasks.jacocoTestReport {
+    reports {
+        xml.required = true
+    }
+    dependsOn(tasks.test) // tests are required to run before generating the report
+}
+
+tasks.withType<Javadoc> {
     val options = options as StandardJavadocDocletOptions
     options.encoding = "UTF-8"
+
     options.tags("apiNote:a:API Note:", "implSpec:a:Implementation Requirements:", "implNote:a:Implementation Note:")
-    options.docFilesSubDirs(true)
-    options.overview = rootDir.path.plus("src/main/javadoc/overview.md")
+    options.overview = "src/main/javadoc/overview.md"
+    // doesn't work anyway, f u gradle
+//    options.docFilesSubDirs(true)
+
+    doLast {
+        copy {
+            include("**/doc-files/*")
+            from("src/main/javadoc")
+            into(project.layout.buildDirectory.dir("docs/javadoc"))
+        }
+
+    }
 }
\ No newline at end of file

From a4ca474f605dca3ff7936b5a6dc22b2c2d07273d Mon Sep 17 00:00:00 2001
From: Kaktushose <42280757+Kaktushose@users.noreply.github.com>
Date: Sat, 11 Jan 2025 16:39:22 +0100
Subject: [PATCH 30/38] add message builder callback in ConfigurableReply

---
 .../dispatching/reply/ConfigurableReply.java     | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/ConfigurableReply.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/ConfigurableReply.java
index ffbf8b055..ac937b2e0 100644
--- a/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/ConfigurableReply.java
+++ b/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/ConfigurableReply.java
@@ -11,11 +11,13 @@
 import com.github.kaktushose.jda.commands.dispatching.Runtime;
 import net.dv8tion.jda.api.interactions.components.ActionRow;
 import net.dv8tion.jda.api.interactions.components.ItemComponent;
+import net.dv8tion.jda.api.utils.messages.MessageCreateBuilder;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.function.Consumer;
 
 /// Subtype of [MessageReply] that supports adding components to messages and changing the [ReplyConfig].
 ///
@@ -110,6 +112,20 @@ public ConfigurableReply keepComponents(boolean keepComponents) {
         return this;
     }
 
+    /// Access the underlying [MessageCreateBuilder] for configuration steps not covered by [ConfigurableReply].
+    ///
+    /// ## Example:
+    /// ```
+    /// event.with().builder(builder -> builder.setFiles(myFile)).reply("Hello World!");
+    /// ```
+    ///
+    /// @param builder the [MessageCreateBuilder] callback
+    /// @return the current instance for fluent interface
+    public ConfigurableReply builder(Consumer<MessageCreateBuilder> builder) {
+        builder.accept(this.builder);
+        return this;
+    }
+
     /// Adds an [ActionRow] to the reply and adds the passed components to it.
     ///
     /// The components will always be enabled and runtime-bound. Use [#components(Component...)] if you want to modify these

From 5eb4b6fb663661cf5ccb0c4043067d9f7b24f8b6 Mon Sep 17 00:00:00 2001
From: Kaktushose <42280757+Kaktushose@users.noreply.github.com>
Date: Sat, 11 Jan 2025 17:16:54 +0100
Subject: [PATCH 31/38] allow components from different classes in reply [#147]

---
 .../kaktushose/jda/commands/JDACommands.java  | 26 +++++-----
 .../dispatching/events/ReplyableEvent.java    | 49 ++++++++++++++++---
 .../commands/dispatching/reply/Component.java | 40 +++++++++++++--
 .../dispatching/reply/ConfigurableReply.java  |  5 +-
 4 files changed, 94 insertions(+), 26 deletions(-)

diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/JDACommands.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/JDACommands.java
index 331f13326..abc86606e 100644
--- a/jdac/src/main/java/com/github/kaktushose/jda/commands/JDACommands.java
+++ b/jdac/src/main/java/com/github/kaktushose/jda/commands/JDACommands.java
@@ -124,34 +124,34 @@ public void updateGuildCommands() {
         updater.updateGuildCommands();
     }
 
-    /// Gets a [`Button`][com.github.kaktushose.jda.commands.annotations.interactions.Button] based on the definition id
-    /// and transforms it into a JDA [Button].
+    /// Gets a [`Button`][com.github.kaktushose.jda.commands.annotations.interactions.Button] based on the method name
+    /// and the given class and transforms it into a JDA [Button].
     ///
-    /// The button will be [`Runtime`]({@docRoot}/index.html#runtime-concept-heading) independent. This may be useful if you want to send a message without
-    /// using the framework.
+    /// The button will be [`Runtime`]({@docRoot}/index.html#runtime-concept-heading) independent.
+    /// This may be useful if you want to send a message without using the framework.
     ///
     /// @param button the name of the button in the format `FullClassNameWithPackage.method``
     /// @return the JDA [Button]
     @NotNull
-    public Button getButton(@NotNull String button) {
-        var id = String.valueOf(button.replaceAll("\\.", "").hashCode());
+    public Button getButton(@NotNull Class<?> origin, @NotNull String button) {
+        var id = String.valueOf((origin.getName() + button).hashCode());
         var definition = interactionRegistry.find(ButtonDefinition.class, false, it -> it.definitionId().equals(id));
         return definition.toJDAEntity(CustomId.independent(definition.definitionId()));
     }
 
-    /// Gets a [StringSelectMenu] or [EntitySelectMenu] based on the definition id and transforms it into a JDA [SelectMenu].
+    /// Gets a [StringSelectMenu] or [EntitySelectMenu] based on the method name and the given class and transforms it
+    /// into a JDA [SelectMenu].
     ///
-    /// The select menu will be [`Runtime`]({@docRoot}/index.html#runtime-concept-heading) independent. This may be useful if you want to send a component
-    /// without using the framework.
+    /// The select menu will be [`Runtime`]({@docRoot}/index.html#runtime-concept-heading) independent.
+    /// This may be useful if you want to send a component without using the framework.
     ///
+    /// @param origin the [Class] of the method
     /// @param menu the name of the button in the format `FullClassNameWithPackage.method``
     /// @return the JDA [SelectMenu]
-    @SuppressWarnings("unchecked")
     @NotNull
-    public SelectMenu getSelectMenu(@NotNull String menu) {
-        var id = String.valueOf(menu.replaceAll("\\.", "").hashCode());
+    public SelectMenu getSelectMenu(@NotNull Class<?> origin, @NotNull String menu) {
+        var id = String.valueOf((origin.getName() + menu).hashCode());
         var definition = interactionRegistry.find(SelectMenuDefinition.class, false, it -> it.definitionId().equals(id));
         return (SelectMenu) definition.toJDAEntity(CustomId.independent(definition.definitionId()));
     }
-
 }
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/ReplyableEvent.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/ReplyableEvent.java
index 4bf377eae..3745cd283 100644
--- a/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/ReplyableEvent.java
+++ b/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/ReplyableEvent.java
@@ -2,6 +2,7 @@
 
 import com.github.kaktushose.jda.commands.annotations.interactions.EntitySelectMenu;
 import com.github.kaktushose.jda.commands.annotations.interactions.StringSelectMenu;
+import com.github.kaktushose.jda.commands.definitions.features.CustomIdJDAEntity;
 import com.github.kaktushose.jda.commands.definitions.interactions.CustomId;
 import com.github.kaktushose.jda.commands.definitions.interactions.InteractionDefinition;
 import com.github.kaktushose.jda.commands.definitions.interactions.InteractionRegistry;
@@ -18,10 +19,12 @@
 import net.dv8tion.jda.api.entities.Message;
 import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent;
 import net.dv8tion.jda.api.interactions.callbacks.IReplyCallback;
+import net.dv8tion.jda.api.interactions.components.ActionComponent;
 import net.dv8tion.jda.api.interactions.components.buttons.Button;
 import net.dv8tion.jda.api.interactions.components.selections.SelectMenu;
 import net.dv8tion.jda.api.utils.messages.MessageCreateData;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -82,13 +85,25 @@ public void removeComponents() {
     /// The button will be linked to the current [`Runtime`]({@docRoot}/index.html#runtime-concept-heading).
     /// This may be useful if you want to send a component without using the framework.
     ///
-    /// @param button the name of the button
+    /// @param button the name of the button defining method
     /// @return the JDA [Button]
     @NotNull
     public Button getButton(@NotNull String button) {
-        var id = String.valueOf(("%s%s".formatted(definition.clazzDescription().name(), button)).hashCode());
-        var definition = registry.find(ButtonDefinition.class, false, it -> it.definitionId().equals(id));
-        return definition.toJDAEntity(new CustomId(runtimeId(), definition.definitionId()));
+        return getComponent(button, null, ButtonDefinition.class);
+    }
+
+    /// Gets a [`Button`][com.github.kaktushose.jda.commands.annotations.interactions.Button] based on the method name
+    /// and the given class and transforms it into a JDA [Button].
+    ///
+    /// The button will be [`runtime`]({@docRoot}/index.html#runtime-concept-heading)-independent.
+    /// This may be useful if you want to send a component without using the framework.
+    ///
+    /// @param origin the [Class] of the method
+    /// @param button the name of the button defining method
+    /// @return the JDA [Button]
+    @NotNull
+    public Button getButton(@NotNull Class<?> origin, @NotNull String button) {
+        return getComponent(button, null, ButtonDefinition.class);
     }
 
     /// Gets a [StringSelectMenu] or [EntitySelectMenu] based on the method name and transforms it into a JDA [SelectMenu].
@@ -100,9 +115,29 @@ public Button getButton(@NotNull String button) {
     /// @return the JDA [SelectMenu]
     @NotNull
     public SelectMenu getSelectMenu(@NotNull String menu) {
-        var id = String.valueOf(("%s%s".formatted(definition.clazzDescription().name(), menu)).hashCode());
-        var definition = registry.find(SelectMenuDefinition.class, false, it -> it.definitionId().equals(id));
-        return (SelectMenu) definition.toJDAEntity(new CustomId(runtimeId(), definition.definitionId()));
+        return getComponent(menu, null, SelectMenuDefinition.class);
+    }
+
+    /// Gets a [StringSelectMenu] or [EntitySelectMenu] based on the method name and transforms it into a JDA [SelectMenu].
+    ///
+    /// The select menu will be [`runtime`]({@docRoot}/index.html#runtime-concept-heading)-independent.
+    /// This may be useful if you want to send a component without using the framework.
+    ///
+    /// @param origin the [Class] of the method
+    /// @param menu the name of the select menu
+    /// @return the JDA [SelectMenu]
+    @NotNull
+    public SelectMenu getSelectMenu(@NotNull Class<?> origin, @NotNull String menu) {
+        return getComponent(menu, origin, SelectMenuDefinition.class);
+    }
+
+    @NotNull
+    @SuppressWarnings("unchecked")
+    private <C extends ActionComponent, E extends CustomIdJDAEntity<?>> C getComponent(@NotNull String component, @Nullable Class<?> origin, @NotNull Class<E> type) {
+        var className = origin == null ? definition.clazzDescription().name() : origin.getName();
+        var id = String.valueOf((className + component).hashCode());
+        var definition = registry.find(type, false, it -> it.definitionId().equals(id));
+        return (C) definition.toJDAEntity(new CustomId(runtimeId(), definition.definitionId()));
     }
 
     /// Entry point for configuring a reply.
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/Component.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/Component.java
index 2415d304a..fcabf69c1 100644
--- a/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/Component.java
+++ b/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/Component.java
@@ -3,6 +3,8 @@
 import com.github.kaktushose.jda.commands.annotations.interactions.Button;
 import com.github.kaktushose.jda.commands.annotations.interactions.EntitySelectMenu;
 import com.github.kaktushose.jda.commands.annotations.interactions.StringSelectMenu;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 /// Represents a component, namely [Button], [StringSelectMenu] or [EntitySelectMenu], that should be added to a reply.
 ///
@@ -23,9 +25,9 @@
 ///     event.with().components(Components.of(true, false, "onButton")).reply();
 /// }
 ///```
-public record Component(boolean enabled, boolean independent, String name) {
+public record Component(boolean enabled, boolean independent, @NotNull String name, @Nullable Class<?> origin) {
 
-    /// Adds enabled, runtime-bound [Component]s to the reply.
+    /// Adds an enabled, runtime-bound [Component] to the reply.
     ///
     /// @param component the name of the method that represents the component
     public static Component enabled(String component) {
@@ -39,7 +41,7 @@ public static Component disabled(String component) {
         return of(false, false, component);
     }
 
-    /// Adds enabled, runtime-independent [Component]s to the reply.
+    /// Adds an enabled, runtime-independent [Component] to the reply.
     ///
     /// Every component interaction will create a new [`Runtime`]({@docRoot}/index.html#runtime-concept-heading). Furthermore, the component cannot expire and
     /// will always get executed, even after a bot restart.
@@ -49,12 +51,40 @@ public static Component independent(String component) {
         return of(true, true, component);
     }
 
+    /// Adds an enabled [Component] to the reply that is defined in a different class. This [Component] will always be
+    /// runtime-independent.
+    ///
+    /// @param origin    the [Class] the `component` is defined in
+    /// @param component the name of the method that represents the component
+    public static Component enabled(Class<?> origin, String component) {
+        return of(true, origin, component);
+    }
+
+    /// Adds a disabled [Component] to the reply that is defined in a different class. This [Component] will always be
+    /// runtime-independent.
+    ///
+    /// @param origin    the [Class] the `component` is defined in
+    /// @param component the name of the method that represents the component
+    public static Component disabled(Class<?> origin, String component) {
+        return of(false, origin, component);
+    }
+
     /// Adds [Component]s with the passed configuration to the reply.
     ///
     /// @param enabled     whether the [Component] should be enabled or disabled
     /// @param independent whether the [Component] should be runtime-bound or independent
-    /// @param component  the name of the method that represents the component
+    /// @param component   the name of the method that represents the component
     public static Component of(boolean enabled, boolean independent, String component) {
-        return new Component(enabled, independent, component);
+        return new Component(enabled, independent, component, null);
     }
+
+    /// Adds [Component]s with the passed configuration to the reply.
+    ///
+    /// @param enabled   whether the [Component] should be enabled or disabled
+    /// @param origin    the [Class] the `component` is defined in
+    /// @param component the name of the method that represents the component
+    public static Component of(boolean enabled, Class<?> origin, String component) {
+        return new Component(enabled, true, component, origin);
+    }
+
 }
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/ConfigurableReply.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/ConfigurableReply.java
index ac937b2e0..8015278c2 100644
--- a/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/ConfigurableReply.java
+++ b/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/ConfigurableReply.java
@@ -183,7 +183,10 @@ public ComponentReply components(@NotNull String... components) {
     public ComponentReply components(@NotNull Component... components) {
         List<ItemComponent> items = new ArrayList<>();
         for (Component component : components) {
-            var definitionId = String.valueOf((definition.methodDescription().declaringClass().getName() + component.name()).hashCode());
+            var className = component.origin() == null
+                    ? definition.methodDescription().declaringClass().getName()
+                    : component.origin().getName();
+            var definitionId = String.valueOf((className + component.name()).hashCode());
             var definition = registry.find(ComponentDefinition.class, false, it ->
                     it.definitionId().equals(definitionId)
             );

From fb6886800344ae809121c248080fec2e3631e552 Mon Sep 17 00:00:00 2001
From: Kaktushose <42280757+Kaktushose@users.noreply.github.com>
Date: Sun, 12 Jan 2025 18:33:29 +0100
Subject: [PATCH 32/38] improve logging in InteractionRegistry and fix wrong
 docs in AutoComplete

---
 .../commands/annotations/interactions/AutoComplete.java   | 4 ++--
 .../definitions/description/ClassDescription.java         | 5 +++++
 .../definitions/description/MethodDescription.java        | 5 +++++
 .../definitions/description/ParameterDescription.java     | 8 ++++++++
 .../definitions/interactions/InteractionRegistry.java     | 3 ++-
 .../interactions/command/SlashCommandDefinition.java      | 4 +---
 6 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/AutoComplete.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/AutoComplete.java
index 28fa08b8f..e8e3a95a0 100644
--- a/jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/AutoComplete.java
+++ b/jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/AutoComplete.java
@@ -13,12 +13,12 @@
 ///
 /// ## Example:
 /// ```
-/// @SlashCommand(value = "favourite fruit")
+/// @SlashCommand("favourite fruit")
 /// public void fruitCommand(CommandEvent event, String fruit) {
 ///     event.reply("You've chosen: %s", fruit);
 /// }
 ///
-/// @AutoComplete("fruitCommand")
+/// @AutoComplete("favourite fruit")
 /// public void onFruitAutoComplete(AutoCompleteEvent event) {
 ///     event.replyChoices(...);
 /// }
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/description/ClassDescription.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/description/ClassDescription.java
index f6cd131b7..5d8fadcc9 100644
--- a/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/description/ClassDescription.java
+++ b/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/description/ClassDescription.java
@@ -24,4 +24,9 @@ public ClassDescription(@NotNull Class<?> clazz, @NotNull String name, @NotNull
         this.annotations = Collections.unmodifiableCollection(annotations);
         this.methods = Collections.unmodifiableCollection(methods);
     }
+
+    @Override
+    public String toString() {
+        return "ClassDescription(%s)".formatted(name);
+    }
 }
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/description/MethodDescription.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/description/MethodDescription.java
index e1bc8264b..4c466f8fe 100644
--- a/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/description/MethodDescription.java
+++ b/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/description/MethodDescription.java
@@ -31,4 +31,9 @@ public MethodDescription(@NotNull Class<?> declaringClass, @NotNull Class<?> ret
         this.annotations = Collections.unmodifiableCollection(annotations);
         this.invoker = invoker;
     }
+
+    @Override
+    public String toString() {
+        return "MethodDescription(%s)".formatted(name);
+    }
 }
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/description/ParameterDescription.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/description/ParameterDescription.java
index 968c7c124..6ce897a80 100644
--- a/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/description/ParameterDescription.java
+++ b/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/description/ParameterDescription.java
@@ -21,4 +21,12 @@ public ParameterDescription(@NotNull Class<?> type, @NotNull String name, @NotNu
         this.name = name;
         this.annotations = Collections.unmodifiableCollection(annotations);
     }
+
+    @Override
+    public String toString() {
+        return "ParameterDescription{" +
+                "type=" + type +
+                ", name='" + name + '\'' +
+                '}';
+    }
 }
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/InteractionRegistry.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/InteractionRegistry.java
index 754eca221..1d82ad23f 100644
--- a/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/InteractionRegistry.java
+++ b/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/InteractionRegistry.java
@@ -52,7 +52,7 @@ public void index(Iterable<Class<?>> classes) {
 
         int count = 0;
         for (Class<?> clazz : classes) {
-            log.debug("Found interaction controller {}", clazz.getName());
+            log.debug("Found controller: {}", clazz.getName());
             definitions.addAll(indexInteractionClass(descriptor.apply(clazz)));
             count++;
         }
@@ -156,6 +156,7 @@ private Set<Definition> interactionDefinitions(ClassDescription clazz,
                 definition = ModalDefinition.build(context);
             }
 
+            definition.ifPresent(it -> log.debug("Found interaction: {}", it));
             definition.ifPresent(definitions::add);
         }
         return definitions;
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/SlashCommandDefinition.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/SlashCommandDefinition.java
index 670e949fc..66b26fd9f 100644
--- a/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/SlashCommandDefinition.java
+++ b/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/SlashCommandDefinition.java
@@ -150,9 +150,7 @@ public SubcommandData toSubCommandData(String label) {
                 description.replaceAll("N/A", "no description")
 
         );
-        commandOptions.forEach(parameter -> {
-            command.addOptions(parameter.toJDAEntity());
-        });
+        commandOptions.forEach(parameter -> command.addOptions(parameter.toJDAEntity()));
         return command;
     }
 

From dfca7ecfbec61944db9d9ce2edc732b7cbe51ebb Mon Sep 17 00:00:00 2001
From: Kaktushose <42280757+Kaktushose@users.noreply.github.com>
Date: Sun, 12 Jan 2025 18:34:40 +0100
Subject: [PATCH 33/38] rename field clazzDescription -> classDescription

---
 .../commands/definitions/features/internal/Invokable.java   | 2 +-
 .../definitions/interactions/AutoCompleteDefinition.java    | 4 ++--
 .../definitions/interactions/InteractionDefinition.java     | 6 +++---
 .../commands/definitions/interactions/ModalDefinition.java  | 4 ++--
 .../interactions/command/ContextCommandDefinition.java      | 4 ++--
 .../interactions/command/SlashCommandDefinition.java        | 4 ++--
 .../interactions/component/ButtonDefinition.java            | 4 ++--
 .../interactions/component/ComponentDefinition.java         | 2 +-
 .../component/menu/EntitySelectMenuDefinition.java          | 4 ++--
 .../component/menu/StringSelectMenuDefinition.java          | 4 ++--
 .../commands/dispatching/events/ModalReplyableEvent.java    | 2 +-
 .../jda/commands/dispatching/events/ReplyableEvent.java     | 2 +-
 .../jda/commands/dispatching/handling/EventHandler.java     | 2 +-
 .../kaktushose/jda/commands/internal/register/TreeNode.java | 2 +-
 14 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/features/internal/Invokable.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/features/internal/Invokable.java
index 0ee833dae..7d9dc0941 100644
--- a/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/features/internal/Invokable.java
+++ b/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/features/internal/Invokable.java
@@ -43,7 +43,7 @@ default Object invoke(@NotNull Object instance, @NotNull InvocationContext<?> in
 
     /// The [ClassDescription] of the declaring class of the [#methodDescription()].
     @NotNull
-    ClassDescription clazzDescription();
+    ClassDescription classDescription();
 
     /// The [MethodDescription] of the method this [Definition] is bound to.
     @NotNull
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/AutoCompleteDefinition.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/AutoCompleteDefinition.java
index bb60afb20..872df47c6 100644
--- a/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/AutoCompleteDefinition.java
+++ b/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/AutoCompleteDefinition.java
@@ -12,10 +12,10 @@
 
 /// Representation of an auto complete handler.
 ///
-/// @param clazzDescription  the [ClassDescription] of the declaring class of the [#methodDescription()]
+/// @param classDescription  the [ClassDescription] of the declaring class of the [#methodDescription()]
 /// @param methodDescription the [MethodDescription] of the method this definition is bound to
 /// @param commands          the commands this autocomplete handler can handle
-public record AutoCompleteDefinition(@NotNull ClassDescription clazzDescription,
+public record AutoCompleteDefinition(@NotNull ClassDescription classDescription,
                                      @NotNull MethodDescription methodDescription,
                                      @NotNull Set<String> commands)
         implements InteractionDefinition {
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/InteractionDefinition.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/InteractionDefinition.java
index 4bcaaf070..25f0e6531 100644
--- a/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/InteractionDefinition.java
+++ b/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/InteractionDefinition.java
@@ -34,7 +34,7 @@ public sealed interface InteractionDefinition extends Definition, Invokable
     @NotNull
     @Override
     default String definitionId() {
-        return String.valueOf((clazzDescription().clazz().getName() + methodDescription().name()).hashCode());
+        return String.valueOf((classDescription().clazz().getName() + methodDescription().name()).hashCode());
     }
 
     /// Creates a new instance of the [Interaction] class.
@@ -45,7 +45,7 @@ default String definitionId() {
     /// @throws IllegalAccessException    if the object creation fails
     @ApiStatus.Internal
     default Object newInstance() throws InvocationTargetException, InstantiationException, IllegalAccessException {
-        return clazzDescription().clazz().getConstructors()[0].newInstance();
+        return classDescription().clazz().getConstructors()[0].newInstance();
     }
 
     /// A possibly-empty [Collection] of permissions for this interaction.
@@ -60,7 +60,7 @@ default Object newInstance() throws InvocationTargetException, InstantiationExce
     /// annotation of the method and then of the class. If neither is present will fall back to the global [ReplyConfig] provided by [com.github.kaktushose.jda.commands.JDACommandsBuilder]
     @NotNull
     default ReplyConfig replyConfig(@NotNull ReplyConfig globalFallback) {
-        var clazz = clazzDescription().annotation(com.github.kaktushose.jda.commands.annotations.interactions.ReplyConfig.class);
+        var clazz = classDescription().annotation(com.github.kaktushose.jda.commands.annotations.interactions.ReplyConfig.class);
         var method = methodDescription().annotation(com.github.kaktushose.jda.commands.annotations.interactions.ReplyConfig.class);
 
         if (clazz.isEmpty() && method.isEmpty()) {
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/ModalDefinition.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/ModalDefinition.java
index d653aa334..a6652cba5 100644
--- a/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/ModalDefinition.java
+++ b/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/ModalDefinition.java
@@ -17,13 +17,13 @@
 
 /// Representation of a modal.
 ///
-/// @param clazzDescription  the [ClassDescription] of the declaring class of the [#methodDescription()]
+/// @param classDescription  the [ClassDescription] of the declaring class of the [#methodDescription()]
 /// @param methodDescription the [MethodDescription] of the method this definition is bound to
 /// @param permissions       a [Collection] of permissions for this modal
 /// @param title             the title of the modal
 /// @param textInputs        the [`TextInputs`][TextInputDefinition] of this modal
 public record ModalDefinition(
-        @NotNull ClassDescription clazzDescription,
+        @NotNull ClassDescription classDescription,
         @NotNull MethodDescription methodDescription,
         @NotNull Collection<String> permissions,
         @NotNull String title,
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/ContextCommandDefinition.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/ContextCommandDefinition.java
index ffb63a009..fe53c0cfe 100644
--- a/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/ContextCommandDefinition.java
+++ b/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/ContextCommandDefinition.java
@@ -23,7 +23,7 @@
 
 /// Representation of a context command.
 ///
-/// @param clazzDescription     the [ClassDescription] of the declaring class of the [#methodDescription()]
+/// @param classDescription     the [ClassDescription] of the declaring class of the [#methodDescription()]
 /// @param methodDescription    the [MethodDescription] of the method this definition is bound to
 /// @param permissions          a [Collection] of permissions for this command
 /// @param name                 the name of the command
@@ -34,7 +34,7 @@
 /// @param enabledPermissions   a possibly-empty [Set] of [Permission]s this command will be enabled for
 /// @param localizationFunction the [LocalizationFunction] to use for this command
 public record ContextCommandDefinition(
-        @NotNull ClassDescription clazzDescription,
+        @NotNull ClassDescription classDescription,
         @NotNull MethodDescription methodDescription,
         @NotNull Collection<String> permissions,
         @NotNull String name,
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/SlashCommandDefinition.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/SlashCommandDefinition.java
index 66b26fd9f..8c49daddd 100644
--- a/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/SlashCommandDefinition.java
+++ b/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/SlashCommandDefinition.java
@@ -26,7 +26,7 @@
 
 /// Representation of a slash command.
 ///
-/// @param clazzDescription     the [ClassDescription] of the declaring class of the [#methodDescription()]
+/// @param classDescription     the [ClassDescription] of the declaring class of the [#methodDescription()]
 /// @param methodDescription    the [MethodDescription] of the method this definition is bound to
 /// @param permissions          a [Collection] of permissions for this command
 /// @param name                 the name of the command
@@ -40,7 +40,7 @@
 /// @param cooldown             the corresponding [CooldownDefinition]
 /// @param isAutoComplete       whether this command supports auto complete
 public record SlashCommandDefinition(
-        @NotNull ClassDescription clazzDescription,
+        @NotNull ClassDescription classDescription,
         @NotNull MethodDescription methodDescription,
         @NotNull Collection<String> permissions,
         @NotNull String name,
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/ButtonDefinition.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/ButtonDefinition.java
index 54bdd943f..05a7240b1 100644
--- a/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/ButtonDefinition.java
+++ b/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/ButtonDefinition.java
@@ -19,7 +19,7 @@
 
 /// Representation of a button.
 ///
-/// @param clazzDescription  the [ClassDescription] of the declaring class of the [#methodDescription()]
+/// @param classDescription  the [ClassDescription] of the declaring class of the [#methodDescription()]
 /// @param methodDescription the [MethodDescription] of the method this definition is bound to
 /// @param permissions       a [Collection] of permissions for this button
 /// @param label             the label of this button
@@ -27,7 +27,7 @@
 /// @param link              the link of this button or `null`
 /// @param style             the [ButtonStyle] of this button
 public record ButtonDefinition(
-        @NotNull ClassDescription clazzDescription,
+        @NotNull ClassDescription classDescription,
         @NotNull MethodDescription methodDescription,
         @NotNull Collection<String> permissions,
         @NotNull String label,
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/ComponentDefinition.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/ComponentDefinition.java
index aee6ad5bb..8e0b06642 100644
--- a/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/ComponentDefinition.java
+++ b/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/ComponentDefinition.java
@@ -19,7 +19,7 @@ public sealed interface ComponentDefinition<T> extends InteractionDefinition, JD
         permits ButtonDefinition, SelectMenuDefinition {
 
     /// The [ClassDescription] of the declaring class of the [#methodDescription()]
-    @NotNull ClassDescription clazzDescription();
+    @NotNull ClassDescription classDescription();
 
     /// The [MethodDescription] of the method this definition is bound to
     @NotNull MethodDescription methodDescription();
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/menu/EntitySelectMenuDefinition.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/menu/EntitySelectMenuDefinition.java
index 24c6d3654..bbb0fbaa5 100644
--- a/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/menu/EntitySelectMenuDefinition.java
+++ b/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/menu/EntitySelectMenuDefinition.java
@@ -15,7 +15,7 @@
 
 /// Representation of an entity select menu.
 ///
-/// @param clazzDescription  the [ClassDescription] of the declaring class of the [#methodDescription()]
+/// @param classDescription  the [ClassDescription] of the declaring class of the [#methodDescription()]
 /// @param methodDescription the [MethodDescription] of the method this definition is bound to
 /// @param permissions       a [Collection] of permissions for this menu
 /// @param selectTargets     the [EntitySelectMenu.SelectTarget]s of this menu
@@ -25,7 +25,7 @@
 /// @param minValue          the minimum amount of choices
 /// @param maxValue          the maximum amount of choices
 public record EntitySelectMenuDefinition(
-        @NotNull ClassDescription clazzDescription,
+        @NotNull ClassDescription classDescription,
         @NotNull MethodDescription methodDescription,
         @NotNull Collection<String> permissions,
         @NotNull Set<EntitySelectMenu.SelectTarget> selectTargets,
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/menu/StringSelectMenuDefinition.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/menu/StringSelectMenuDefinition.java
index 89c71d5c7..e43ad11f3 100644
--- a/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/menu/StringSelectMenuDefinition.java
+++ b/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/menu/StringSelectMenuDefinition.java
@@ -20,7 +20,7 @@
 
 /// Representation of a string select menu.
 ///
-/// @param clazzDescription  the [ClassDescription] of the declaring class of the [#methodDescription()]
+/// @param classDescription  the [ClassDescription] of the declaring class of the [#methodDescription()]
 /// @param methodDescription the [MethodDescription] of the method this definition is bound to
 /// @param permissions       a [Collection] of permissions for this menu
 /// @param selectOptions     the [SelectOptions][SelectOptionDefinition] of this menu
@@ -28,7 +28,7 @@
 /// @param minValue          the minimum amount of choices
 /// @param maxValue          the maximum amount of choices
 public record StringSelectMenuDefinition(
-        @NotNull ClassDescription clazzDescription,
+        @NotNull ClassDescription classDescription,
         @NotNull MethodDescription methodDescription,
         @NotNull Collection<String> permissions,
         @NotNull Set<SelectOptionDefinition> selectOptions,
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/ModalReplyableEvent.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/ModalReplyableEvent.java
index b7f04ec93..c811b655d 100644
--- a/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/ModalReplyableEvent.java
+++ b/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/ModalReplyableEvent.java
@@ -47,7 +47,7 @@ protected ModalReplyableEvent(@NotNull T event,
     /// @throws IllegalArgumentException if no [Modal] with the given name was found
     public void replyModal(@NotNull String modal) {
         if (event instanceof IModalCallback callback) {
-            var definitionId = String.valueOf((definition.clazzDescription().name() + modal).hashCode());
+            var definitionId = String.valueOf((definition.classDescription().name() + modal).hashCode());
             var modalDefinition = registry.find(ModalDefinition.class, false, it ->
                     it.definitionId().equals(definitionId)
             );
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/ReplyableEvent.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/ReplyableEvent.java
index 3745cd283..6d9137a5e 100644
--- a/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/ReplyableEvent.java
+++ b/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/ReplyableEvent.java
@@ -134,7 +134,7 @@ public SelectMenu getSelectMenu(@NotNull Class<?> origin, @NotNull String menu)
     @NotNull
     @SuppressWarnings("unchecked")
     private <C extends ActionComponent, E extends CustomIdJDAEntity<?>> C getComponent(@NotNull String component, @Nullable Class<?> origin, @NotNull Class<E> type) {
-        var className = origin == null ? definition.clazzDescription().name() : origin.getName();
+        var className = origin == null ? definition.classDescription().name() : origin.getName();
         var id = String.valueOf((className + component).hashCode());
         var definition = registry.find(type, false, it -> it.definitionId().equals(id));
         return (C) definition.toJDAEntity(new CustomId(runtimeId(), definition.definitionId()));
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/EventHandler.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/EventHandler.java
index 635cb1649..1bfc57971 100644
--- a/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/EventHandler.java
+++ b/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/EventHandler.java
@@ -94,7 +94,7 @@ private void invoke(@NotNull InvocationContext<T> invocation, @NotNull Runtime r
         log.info("Executing interaction \"{}\" for user \"{}\"", definition.displayName(), invocation.event().getUser().getEffectiveName());
         try {
             log.debug("Invoking method \"{}.{}\" with following arguments: {}",
-                    definition.clazzDescription().name(),
+                    definition.classDescription().name(),
                     definition.methodDescription().name(),
                     arguments
             );
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/internal/register/TreeNode.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/internal/register/TreeNode.java
index feddc13d2..3618d6dea 100644
--- a/jdac/src/main/java/com/github/kaktushose/jda/commands/internal/register/TreeNode.java
+++ b/jdac/src/main/java/com/github/kaktushose/jda/commands/internal/register/TreeNode.java
@@ -149,7 +149,7 @@ private void toCommandData(Collection<SlashCommandData> commands) {
         try {
             commands.add(command.toJDAEntity());
         } catch (Exception e) {
-            log.error("Cannot convert command {}.{} to  SlashCommandData!", command.clazzDescription().name(), command.methodDescription().name(), e);
+            log.error("Cannot convert command {}.{} to  SlashCommandData!", command.classDescription().name(), command.methodDescription().name(), e);
         }
     }
 

From ebe5b4df12c34b610ab5aba2ad2b55282e3e2f1b Mon Sep 17 00:00:00 2001
From: Kaktushose <42280757+Kaktushose@users.noreply.github.com>
Date: Sun, 12 Jan 2025 19:35:19 +0100
Subject: [PATCH 34/38] add method reference option for AutoComplete

---
 .../interactions/AutoComplete.java            | 45 ++++++++++++++-----
 .../interactions/InteractionRegistry.java     | 20 +++++----
 .../command/SlashCommandDefinition.java       |  2 +-
 .../handling/AutoCompleteHandler.java         | 33 ++++++++++----
 4 files changed, 69 insertions(+), 31 deletions(-)

diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/AutoComplete.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/AutoComplete.java
index e8e3a95a0..77067f093 100644
--- a/jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/AutoComplete.java
+++ b/jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/AutoComplete.java
@@ -9,20 +9,41 @@
 import java.lang.annotation.Target;
 
 /// Methods annotated with AutoComplete will be registered as a handler for [AutoCompleteEvent]s for the given
-/// [SlashCommand](s).
+/// [SlashCommand]s.
 ///
-/// ## Example:
-/// ```
-/// @SlashCommand("favourite fruit")
-/// public void fruitCommand(CommandEvent event, String fruit) {
-///     event.reply("You've chosen: %s", fruit);
-/// }
+/// The [SlashCommand]s can either be referenced by:
+/// 1. Command Name
 ///
-/// @AutoComplete("favourite fruit")
-/// public void onFruitAutoComplete(AutoCompleteEvent event) {
-///     event.replyChoices(...);
-/// }
-/// ```
+///     If referenced by the command name the handler will handle any command that's name starts with the given name:
+///     ```
+///     @SlashCommand("favourite fruit")
+///     public void fruitCommand(CommandEvent event, String fruit) {
+///         event.reply("You've chosen: %s", fruit);
+///     }
+///     @SlashCommand("favourite vegetable")
+///     public void vegetableCommand(CommandEvent event, String vegetable) {
+///         event.reply("You've chosen: %s", vegetable);
+///     }
+///
+///     @AutoComplete("favourite")
+///     public void onFavouriteAutoComplete(AutoCompleteEvent event) {
+///         event.replyChoices(...);
+///     }
+///     ```
+/// 2. Method Name
+///
+///     If referenced by the method name the handler will only handle the command of the given method:
+///     ```
+///     @SlashCommand("favourite fruit")
+///     public void fruitCommand(CommandEvent event, String fruit) {
+///         event.reply("You've chosen: %s", fruit);
+///     }
+///
+///     @AutoComplete("fruitCommand")
+///     public void onFruitAutoComplete(AutoCompleteEvent event) {
+///         event.replyChoices(...);
+///     }
+///     ```
 /// @see SlashCommand
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/InteractionRegistry.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/InteractionRegistry.java
index 1d82ad23f..be34c53c0 100644
--- a/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/InteractionRegistry.java
+++ b/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/InteractionRegistry.java
@@ -96,8 +96,10 @@ private Collection<Definition> indexInteractionClass(ClassDescription clazz) {
         autoCompletes.stream()
                 .map(AutoCompleteDefinition::commands)
                 .flatMap(Collection::stream)
-                .filter(name -> commandDefinitions.stream().noneMatch(command -> command.name().startsWith(name)))
-                .forEach(s -> log.warn("No Command found for auto complete {}", s));
+                .filter(name -> commandDefinitions.stream().noneMatch(command ->
+                        command.name().startsWith(name) || command.methodDescription().name().equals(name))
+                ).forEach(s -> log.warn("No Command found for auto complete {}", s));
+
 
         return interactionDefinitions;
     }
@@ -166,12 +168,12 @@ private Set<Definition> interactionDefinitions(ClassDescription clazz,
     ///
     /// @param type          the type of the [Definition] to find
     /// @param internalError `true` if the [Definition] must be found and not finding it
-    ///                      indicates a framework bug
+    ///                                                                indicates a framework bug
     /// @param predicate     the [Predicate] used to find the [Definition]
     /// @param <T>           a subtype of [Definition]
     /// @return [T]
     /// @throws IllegalStateException    if no [Definition] was found, although this mandatory should have been the case.
-    ///                                  This is a rare occasion and can be considered a framework bug
+    ///                                                                                                    This is a rare occasion and can be considered a framework bug
     /// @throws IllegalArgumentException if no [Definition] was found, because the [Predicate] didn't include any elements
     public <T extends Definition> T find(Class<T> type, boolean internalError, Predicate<T> predicate) {
         return definitions.stream()
@@ -187,13 +189,13 @@ public <T extends Definition> T find(Class<T> type, boolean internalError, Predi
 
     /// Attempts to find all [Definition]s of type [T] based on the given [Predicate].
     ///
-    /// @param type          the type of the [Definition] to find
-    ///                      indicates a framework bug
-    /// @param predicate     the [Predicate] used to find the [Definition]s
-    /// @param <T>           a subtype of [Definition]
+    /// @param type      the type of the [Definition] to find
+    ///                                                        indicates a framework bug
+    /// @param predicate the [Predicate] used to find the [Definition]s
+    /// @param <T>       a subtype of [Definition]
     /// @return a possibly-empty [Collection] of all [Definition]s that match the given [Predicate]
     /// @throws IllegalStateException    if no [Definition] was found, although this mandatory should have been the case.
-    ///                                  This is a rare occasion and can be considered a framework bug
+    ///                                                                                                    This is a rare occasion and can be considered a framework bug
     /// @throws IllegalArgumentException if no [Definition] was found, because the [Predicate] didn't include any elements
     public <T extends Definition> Collection<T> find(Class<T> type, Predicate<T> predicate) {
         return definitions.stream()
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/SlashCommandDefinition.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/SlashCommandDefinition.java
index 8c49daddd..1e38e2596 100644
--- a/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/SlashCommandDefinition.java
+++ b/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/SlashCommandDefinition.java
@@ -76,7 +76,7 @@ public static Optional<SlashCommandDefinition> build(MethodBuildContext context)
         boolean autoComplete = context.autoCompleteDefinitions().stream()
                 .map(AutoCompleteDefinition::commands)
                 .flatMap(Collection::stream)
-                .anyMatch(name::startsWith);
+                .anyMatch(it -> name.startsWith(it) || it.equals(method.name()));
 
         // build option data definitions
         List<OptionDataDefinition> commandOptions = method.parameters().stream()
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/AutoCompleteHandler.java b/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/AutoCompleteHandler.java
index 4c68629ae..df1fc4067 100644
--- a/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/AutoCompleteHandler.java
+++ b/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/AutoCompleteHandler.java
@@ -1,6 +1,7 @@
 package com.github.kaktushose.jda.commands.dispatching.handling;
 
 import com.github.kaktushose.jda.commands.definitions.interactions.AutoCompleteDefinition;
+import com.github.kaktushose.jda.commands.definitions.interactions.command.SlashCommandDefinition;
 import com.github.kaktushose.jda.commands.dispatching.Runtime;
 import com.github.kaktushose.jda.commands.dispatching.context.InvocationContext;
 import com.github.kaktushose.jda.commands.dispatching.events.interactions.AutoCompleteEvent;
@@ -10,6 +11,7 @@
 import org.jetbrains.annotations.NotNull;
 
 import java.util.List;
+import java.util.Optional;
 
 @ApiStatus.Internal
 public final class AutoCompleteHandler extends EventHandler<CommandAutoCompleteInteractionEvent> {
@@ -21,15 +23,28 @@ public AutoCompleteHandler(DispatchingContext dispatchingContext) {
     @Override
     protected InvocationContext<CommandAutoCompleteInteractionEvent> prepare(@NotNull CommandAutoCompleteInteractionEvent event, @NotNull Runtime runtime) {
         CommandAutoCompleteInteraction interaction = event.getInteraction();
+        Optional<AutoCompleteDefinition> autoComplete;
 
-        return registry.find(AutoCompleteDefinition.class,
-                        it -> it.commands().stream().anyMatch(name -> interaction.getFullCommandName().startsWith(name))
-                ).stream()
-                .findFirst()
-                .map(autoComplete -> new InvocationContext<>(event, runtime.keyValueStore(), autoComplete, List.of(new AutoCompleteEvent(event, registry, runtime))))
-                .orElseGet(() -> {
-                    log.debug("No auto complete handler found for {}", interaction.getFullCommandName());
-                    return null;
-                });
+        autoComplete = registry.find(AutoCompleteDefinition.class,
+                it -> it.commands().stream().anyMatch(name -> interaction.getFullCommandName().startsWith(name))
+        ).stream().findFirst();
+
+        if (autoComplete.isEmpty()) {
+            var command = registry.find(SlashCommandDefinition.class,
+                    it -> it.name().equals(interaction.getFullCommandName())
+            ).stream().findFirst();
+            if (command.isPresent()) {
+                autoComplete = registry.find(AutoCompleteDefinition.class,
+                        it -> it.commands().stream().anyMatch(name -> command.get().methodDescription().name().equals(name))
+                ).stream().findFirst();
+            }
+        }
+
+        return autoComplete.map(it ->
+                new InvocationContext<>(event, runtime.keyValueStore(), it, List.of(new AutoCompleteEvent(event, registry, runtime)))
+        ).orElseGet(() -> {
+            log.debug("No auto complete handler found for {}", interaction.getFullCommandName());
+            return null;
+        });
     }
 }

From 9d55834b20e34c65a95e696984229cdcd46f33bb Mon Sep 17 00:00:00 2001
From: Kaktushose <42280757+Kaktushose@users.noreply.github.com>
Date: Sun, 12 Jan 2025 20:03:00 +0100
Subject: [PATCH 35/38] rename jdac -> jda-commands

---
 .github/workflows/coverage.yml                      |   2 +-
 .github/workflows/javadocs.yml                      |   2 +-
 {jdac => jda-commands}/build.gradle.kts             |   0
 {jdac => jda-commands}/src/examples/BanCommand.java |   0
 .../src/examples/CookieClicker.java                 |   0
 {jdac => jda-commands}/src/examples/Main.java       |   0
 {jdac => jda-commands}/src/examples/embeds.json     |   0
 .../src/examples/scope/PremiumCommand.java          |   0
 .../src/examples/scope/PremiumGuildsProvider.java   |   0
 .../github/kaktushose/jda/commands/JDACommands.java |   0
 .../kaktushose/jda/commands/JDACommandsBuilder.java |   0
 .../jda/commands/annotations/Implementation.java    |   0
 .../kaktushose/jda/commands/annotations/Inject.java |   0
 .../jda/commands/annotations/Produces.java          |   0
 .../annotations/constraints/Constraint.java         |   0
 .../jda/commands/annotations/constraints/Max.java   |   0
 .../jda/commands/annotations/constraints/Min.java   |   0
 .../commands/annotations/constraints/NotPerm.java   |   0
 .../commands/annotations/constraints/NotRole.java   |   0
 .../commands/annotations/constraints/NotUser.java   |   0
 .../jda/commands/annotations/constraints/Perm.java  |   0
 .../jda/commands/annotations/constraints/Role.java  |   0
 .../jda/commands/annotations/constraints/User.java  |   0
 .../annotations/constraints/package-info.java       |   0
 .../annotations/interactions/AutoComplete.java      |   0
 .../commands/annotations/interactions/Button.java   |   0
 .../commands/annotations/interactions/Choices.java  |   0
 .../annotations/interactions/CommandScope.java      |   0
 .../annotations/interactions/ContextCommand.java    |   0
 .../commands/annotations/interactions/Cooldown.java |   0
 .../annotations/interactions/EntitySelectMenu.java  |   0
 .../annotations/interactions/Interaction.java       |   0
 .../commands/annotations/interactions/Modal.java    |   0
 .../commands/annotations/interactions/Optional.java |   0
 .../commands/annotations/interactions/Param.java    |   0
 .../annotations/interactions/Permissions.java       |   0
 .../annotations/interactions/ReplyConfig.java       |   0
 .../annotations/interactions/SelectOption.java      |   0
 .../annotations/interactions/SlashCommand.java      |   0
 .../annotations/interactions/StringSelectMenu.java  |   0
 .../annotations/interactions/TextInput.java         |   0
 .../annotations/interactions/package-info.java      |   0
 .../annotations/internal/SelectOptionContainer.java |   0
 .../commands/annotations/internal/package-info.java |   0
 .../jda/commands/annotations/package-info.java      |   0
 .../jda/commands/definitions/Definition.java        |   0
 .../definitions/description/ClassDescription.java   |   0
 .../definitions/description/ClassFinder.java        |   0
 .../definitions/description/Description.java        |   0
 .../definitions/description/Descriptor.java         |   0
 .../commands/definitions/description/Invoker.java   |   0
 .../definitions/description/MethodDescription.java  |   0
 .../description/ParameterDescription.java           |   0
 .../definitions/description/package-info.java       |   0
 .../reflective/ReflectiveClassFinder.java           |   0
 .../reflective/ReflectiveDescriptor.java            |   0
 .../description/reflective/package-info.java        |   0
 .../definitions/features/CustomIdJDAEntity.java     |   0
 .../commands/definitions/features/JDAEntity.java    |   0
 .../definitions/features/internal/Invokable.java    |   0
 .../commands/definitions/features/package-info.java |   0
 .../interactions/AutoCompleteDefinition.java        |   0
 .../commands/definitions/interactions/CustomId.java |   0
 .../interactions/InteractionDefinition.java         |   0
 .../interactions/InteractionRegistry.java           |   0
 .../interactions/MethodBuildContext.java            |   0
 .../definitions/interactions/ModalDefinition.java   |   0
 .../interactions/command/CommandDefinition.java     |   0
 .../command/ContextCommandDefinition.java           |   0
 .../interactions/command/OptionDataDefinition.java  |   0
 .../command/SlashCommandDefinition.java             |   0
 .../interactions/command/package-info.java          |   0
 .../interactions/component/ButtonDefinition.java    |   0
 .../interactions/component/ComponentDefinition.java |   0
 .../component/menu/EntitySelectMenuDefinition.java  |   0
 .../component/menu/SelectMenuDefinition.java        |   0
 .../component/menu/StringSelectMenuDefinition.java  |   0
 .../interactions/component/menu/package-info.java   |   0
 .../interactions/component/package-info.java        |   0
 .../definitions/interactions/package-info.java      |   0
 .../dependency/DefaultDependencyInjector.java       |   0
 .../jda/commands/dependency/DependencyInjector.java |   0
 .../jda/commands/dependency/package-info.java       |   0
 .../jda/commands/dispatching/JDAEventListener.java  |   0
 .../jda/commands/dispatching/Runtime.java           |   0
 .../commands/dispatching/adapter/TypeAdapter.java   |   0
 .../adapter/impl/AudioChannelAdapter.java           |   0
 .../dispatching/adapter/impl/BooleanAdapter.java    |   0
 .../dispatching/adapter/impl/ByteAdapter.java       |   0
 .../dispatching/adapter/impl/CharacterAdapter.java  |   0
 .../dispatching/adapter/impl/DoubleAdapter.java     |   0
 .../dispatching/adapter/impl/FloatAdapter.java      |   0
 .../adapter/impl/GuildChannelAdapter.java           |   0
 .../adapter/impl/GuildMessageChannelAdapter.java    |   0
 .../dispatching/adapter/impl/IntegerAdapter.java    |   0
 .../dispatching/adapter/impl/LongAdapter.java       |   0
 .../dispatching/adapter/impl/MemberAdapter.java     |   0
 .../adapter/impl/NewsChannelAdapter.java            |   0
 .../dispatching/adapter/impl/RoleAdapter.java       |   0
 .../dispatching/adapter/impl/ShortAdapter.java      |   0
 .../adapter/impl/StageChannelAdapter.java           |   0
 .../adapter/impl/TextChannelAdapter.java            |   0
 .../adapter/impl/ThreadChannelAdapter.java          |   0
 .../dispatching/adapter/impl/UserAdapter.java       |   0
 .../adapter/impl/VoiceChannelAdapter.java           |   0
 .../dispatching/adapter/impl/package-info.java      |   0
 .../dispatching/adapter/internal/TypeAdapters.java  |   0
 .../commands/dispatching/adapter/package-info.java  |   0
 .../dispatching/context/InvocationContext.java      |   0
 .../commands/dispatching/context/KeyValueStore.java |   0
 .../jda/commands/dispatching/events/Event.java      |   0
 .../dispatching/events/ModalReplyableEvent.java     |   0
 .../commands/dispatching/events/ReplyableEvent.java |   0
 .../events/interactions/AutoCompleteEvent.java      |   0
 .../events/interactions/CommandEvent.java           |   0
 .../events/interactions/ComponentEvent.java         |   0
 .../dispatching/events/interactions/ModalEvent.java |   0
 .../events/interactions/package-info.java           |   0
 .../commands/dispatching/events/package-info.java   |   0
 .../dispatching/expiration/ExpirationStrategy.java  |   0
 .../dispatching/handling/AutoCompleteHandler.java   |   0
 .../dispatching/handling/ComponentHandler.java      |   0
 .../dispatching/handling/DispatchingContext.java    |   0
 .../commands/dispatching/handling/EventHandler.java |   0
 .../commands/dispatching/handling/ModalHandler.java |   0
 .../handling/command/ContextCommandHandler.java     |   0
 .../handling/command/SlashCommandHandler.java       |   0
 .../dispatching/handling/command/package-info.java  |   0
 .../commands/dispatching/handling/package-info.java |   0
 .../commands/dispatching/middleware/Middleware.java |   0
 .../commands/dispatching/middleware/Priority.java   |   0
 .../middleware/impl/ConstraintMiddleware.java       |   0
 .../middleware/impl/CooldownMiddleware.java         |   0
 .../middleware/impl/PermissionsMiddleware.java      |   0
 .../dispatching/middleware/impl/package-info.java   |   0
 .../middleware/internal/Middlewares.java            |   0
 .../dispatching/middleware/package-info.java        |   0
 .../jda/commands/dispatching/package-info.java      |   0
 .../jda/commands/dispatching/reply/Component.java   |   0
 .../commands/dispatching/reply/ComponentReply.java  |   0
 .../dispatching/reply/ConfigurableReply.java        |   0
 .../commands/dispatching/reply/MessageReply.java    |   0
 .../jda/commands/dispatching/reply/Reply.java       |   0
 .../commands/dispatching/reply/package-info.java    |   0
 .../commands/dispatching/validation/Validator.java  |   0
 .../validation/impl/MaximumValidator.java           |   0
 .../validation/impl/MinimumValidator.java           |   0
 .../validation/impl/NotPermissionValidator.java     |   0
 .../validation/impl/NotRoleValidator.java           |   0
 .../validation/impl/NotUserValidator.java           |   0
 .../validation/impl/PermissionValidator.java        |   0
 .../dispatching/validation/impl/RoleValidator.java  |   0
 .../dispatching/validation/impl/UserValidator.java  |   0
 .../dispatching/validation/impl/package-info.java   |   0
 .../dispatching/validation/internal/Validators.java |   0
 .../dispatching/validation/package-info.java        |   0
 .../kaktushose/jda/commands/embeds/EmbedCache.java  |   0
 .../kaktushose/jda/commands/embeds/EmbedDTO.java    |   0
 .../embeds/error/DefaultErrorMessageFactory.java    |   0
 .../commands/embeds/error/ErrorMessageFactory.java  |   0
 .../embeds/error/JsonErrorMessageFactory.java       |   0
 .../jda/commands/embeds/error/package-info.java     |   0
 .../jda/commands/embeds/package-info.java           |   0
 .../kaktushose/jda/commands/internal/Helpers.java   |   0
 .../jda/commands/internal/JDAContext.java           |   0
 .../jda/commands/internal/register/CommandTree.java |   0
 .../internal/register/SlashCommandUpdater.java      |   0
 .../jda/commands/internal/register/TreeNode.java    |   0
 .../kaktushose/jda/commands/package-info.java       |   0
 .../permissions/DefaultPermissionsProvider.java     |   0
 .../commands/permissions/PermissionsProvider.java   |   0
 .../jda/commands/permissions/package-info.java      |   0
 .../commands/scope/DefaultGuildScopeProvider.java   |   0
 .../jda/commands/scope/GuildScopeProvider.java      |   0
 .../kaktushose/jda/commands/scope/package-info.java |   0
 .../src/main/java/module-info.java                  |   0
 .../src/main/javadoc/doc-files/flowchart.png        | Bin
 {jdac => jda-commands}/src/main/javadoc/overview.md |   0
 .../src/test/java/adapting/CustomType.java          |   0
 .../src/test/java/adapting/CustomTypeAdapter.java   |   0
 .../test/java/adapting/TypeAdapterRegistryTest.java |   0
 .../src/test/java/adapting/TypeAdapterTest.java     |   0
 .../java/adapting/mock/CacheRestActionMock.java     |   0
 .../src/test/java/adapting/mock/GuildMock.java      |   0
 .../test/java/adapting/mock/JDACommandsMock.java    |   0
 .../src/test/java/adapting/mock/JDAMock.java        |   0
 .../src/test/java/adapting/mock/MemberMock.java     |   0
 .../src/test/java/adapting/mock/RestActionMock.java |   0
 .../src/test/java/adapting/mock/RoleMock.java       |   0
 .../mock/SlashCommandInteractionEventMock.java      |   0
 .../adapting/mock/SlashCommandInteractionMock.java  |   0
 .../test/java/adapting/mock/TextChannelMock.java    |   0
 .../mock/TypeAdapterRegistryTestController.java     |   0
 .../src/test/java/adapting/mock/UserMock.java       |   0
 .../commands/CommandDefinitionTestController.java   |   0
 .../java/commands/SlashCommandDefinitionTest.java   |   0
 .../src/test/java/commands/UnsupportedType.java     |   0
 .../src/test/java/dependency/Dependency.java        |   0
 .../java/dependency/DependencyInjectorTest.java     |   0
 .../src/test/java/dependency/InjectableClass.java   |   0
 .../src/test/java/dependency/ProducingClass.java    |   0
 .../test/java/dependency/WrongProducingClass.java   |   0
 .../java/parameters/OptionDataDefinitionTest.java   |   0
 .../java/parameters/ParameterTestController.java    |   0
 .../src/test/java/reply/CustomController.java       |   0
 .../src/test/java/reply/DefaultController.java      |   0
 .../src/test/java/reply/ReplyConfigTest.java        |   0
 settings.gradle.kts                                 |   2 +-
 208 files changed, 3 insertions(+), 3 deletions(-)
 rename {jdac => jda-commands}/build.gradle.kts (100%)
 rename {jdac => jda-commands}/src/examples/BanCommand.java (100%)
 rename {jdac => jda-commands}/src/examples/CookieClicker.java (100%)
 rename {jdac => jda-commands}/src/examples/Main.java (100%)
 rename {jdac => jda-commands}/src/examples/embeds.json (100%)
 rename {jdac => jda-commands}/src/examples/scope/PremiumCommand.java (100%)
 rename {jdac => jda-commands}/src/examples/scope/PremiumGuildsProvider.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/JDACommands.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/JDACommandsBuilder.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/annotations/Implementation.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/annotations/Inject.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/annotations/Produces.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/Constraint.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/Max.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/Min.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/NotPerm.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/NotRole.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/NotUser.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/Perm.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/Role.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/User.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/package-info.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/AutoComplete.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Button.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Choices.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/CommandScope.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/ContextCommand.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Cooldown.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/EntitySelectMenu.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Interaction.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Modal.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Optional.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Param.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Permissions.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/ReplyConfig.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/SelectOption.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/SlashCommand.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/StringSelectMenu.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/TextInput.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/package-info.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/annotations/internal/SelectOptionContainer.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/annotations/internal/package-info.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/annotations/package-info.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/definitions/Definition.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/definitions/description/ClassDescription.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/definitions/description/ClassFinder.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/definitions/description/Description.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/definitions/description/Descriptor.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/definitions/description/Invoker.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/definitions/description/MethodDescription.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/definitions/description/ParameterDescription.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/definitions/description/package-info.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/definitions/description/reflective/ReflectiveClassFinder.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/definitions/description/reflective/ReflectiveDescriptor.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/definitions/description/reflective/package-info.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/definitions/features/CustomIdJDAEntity.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/definitions/features/JDAEntity.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/definitions/features/internal/Invokable.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/definitions/features/package-info.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/AutoCompleteDefinition.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/CustomId.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/InteractionDefinition.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/InteractionRegistry.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/MethodBuildContext.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/ModalDefinition.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/CommandDefinition.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/ContextCommandDefinition.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/OptionDataDefinition.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/SlashCommandDefinition.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/package-info.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/ButtonDefinition.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/ComponentDefinition.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/menu/EntitySelectMenuDefinition.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/menu/SelectMenuDefinition.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/menu/StringSelectMenuDefinition.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/menu/package-info.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/package-info.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/package-info.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/dependency/DefaultDependencyInjector.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/dependency/DependencyInjector.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/dependency/package-info.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/dispatching/JDAEventListener.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/dispatching/Runtime.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/TypeAdapter.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/AudioChannelAdapter.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/BooleanAdapter.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/ByteAdapter.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/CharacterAdapter.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/DoubleAdapter.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/FloatAdapter.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/GuildChannelAdapter.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/GuildMessageChannelAdapter.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/IntegerAdapter.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/LongAdapter.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/MemberAdapter.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/NewsChannelAdapter.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/RoleAdapter.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/ShortAdapter.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/StageChannelAdapter.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/TextChannelAdapter.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/ThreadChannelAdapter.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/UserAdapter.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/VoiceChannelAdapter.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/package-info.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/internal/TypeAdapters.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/package-info.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/dispatching/context/InvocationContext.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/dispatching/context/KeyValueStore.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/Event.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/ModalReplyableEvent.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/ReplyableEvent.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/interactions/AutoCompleteEvent.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/interactions/CommandEvent.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/interactions/ComponentEvent.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/interactions/ModalEvent.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/interactions/package-info.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/package-info.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/dispatching/expiration/ExpirationStrategy.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/AutoCompleteHandler.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/ComponentHandler.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/DispatchingContext.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/EventHandler.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/ModalHandler.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/command/ContextCommandHandler.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/command/SlashCommandHandler.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/command/package-info.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/package-info.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/Middleware.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/Priority.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/ConstraintMiddleware.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/CooldownMiddleware.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/PermissionsMiddleware.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/package-info.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/internal/Middlewares.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/package-info.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/dispatching/package-info.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/Component.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/ComponentReply.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/ConfigurableReply.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/MessageReply.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/Reply.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/package-info.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/Validator.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/MaximumValidator.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/MinimumValidator.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/NotPermissionValidator.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/NotRoleValidator.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/NotUserValidator.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/PermissionValidator.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/RoleValidator.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/UserValidator.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/package-info.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/internal/Validators.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/package-info.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/embeds/EmbedCache.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/embeds/EmbedDTO.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/embeds/error/DefaultErrorMessageFactory.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/embeds/error/ErrorMessageFactory.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/embeds/error/JsonErrorMessageFactory.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/embeds/error/package-info.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/embeds/package-info.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/internal/Helpers.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/internal/JDAContext.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/internal/register/CommandTree.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/internal/register/SlashCommandUpdater.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/internal/register/TreeNode.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/package-info.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/permissions/DefaultPermissionsProvider.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/permissions/PermissionsProvider.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/permissions/package-info.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/scope/DefaultGuildScopeProvider.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/scope/GuildScopeProvider.java (100%)
 rename {jdac => jda-commands}/src/main/java/com/github/kaktushose/jda/commands/scope/package-info.java (100%)
 rename {jdac => jda-commands}/src/main/java/module-info.java (100%)
 rename {jdac => jda-commands}/src/main/javadoc/doc-files/flowchart.png (100%)
 rename {jdac => jda-commands}/src/main/javadoc/overview.md (100%)
 rename {jdac => jda-commands}/src/test/java/adapting/CustomType.java (100%)
 rename {jdac => jda-commands}/src/test/java/adapting/CustomTypeAdapter.java (100%)
 rename {jdac => jda-commands}/src/test/java/adapting/TypeAdapterRegistryTest.java (100%)
 rename {jdac => jda-commands}/src/test/java/adapting/TypeAdapterTest.java (100%)
 rename {jdac => jda-commands}/src/test/java/adapting/mock/CacheRestActionMock.java (100%)
 rename {jdac => jda-commands}/src/test/java/adapting/mock/GuildMock.java (100%)
 rename {jdac => jda-commands}/src/test/java/adapting/mock/JDACommandsMock.java (100%)
 rename {jdac => jda-commands}/src/test/java/adapting/mock/JDAMock.java (100%)
 rename {jdac => jda-commands}/src/test/java/adapting/mock/MemberMock.java (100%)
 rename {jdac => jda-commands}/src/test/java/adapting/mock/RestActionMock.java (100%)
 rename {jdac => jda-commands}/src/test/java/adapting/mock/RoleMock.java (100%)
 rename {jdac => jda-commands}/src/test/java/adapting/mock/SlashCommandInteractionEventMock.java (100%)
 rename {jdac => jda-commands}/src/test/java/adapting/mock/SlashCommandInteractionMock.java (100%)
 rename {jdac => jda-commands}/src/test/java/adapting/mock/TextChannelMock.java (100%)
 rename {jdac => jda-commands}/src/test/java/adapting/mock/TypeAdapterRegistryTestController.java (100%)
 rename {jdac => jda-commands}/src/test/java/adapting/mock/UserMock.java (100%)
 rename {jdac => jda-commands}/src/test/java/commands/CommandDefinitionTestController.java (100%)
 rename {jdac => jda-commands}/src/test/java/commands/SlashCommandDefinitionTest.java (100%)
 rename {jdac => jda-commands}/src/test/java/commands/UnsupportedType.java (100%)
 rename {jdac => jda-commands}/src/test/java/dependency/Dependency.java (100%)
 rename {jdac => jda-commands}/src/test/java/dependency/DependencyInjectorTest.java (100%)
 rename {jdac => jda-commands}/src/test/java/dependency/InjectableClass.java (100%)
 rename {jdac => jda-commands}/src/test/java/dependency/ProducingClass.java (100%)
 rename {jdac => jda-commands}/src/test/java/dependency/WrongProducingClass.java (100%)
 rename {jdac => jda-commands}/src/test/java/parameters/OptionDataDefinitionTest.java (100%)
 rename {jdac => jda-commands}/src/test/java/parameters/ParameterTestController.java (100%)
 rename {jdac => jda-commands}/src/test/java/reply/CustomController.java (100%)
 rename {jdac => jda-commands}/src/test/java/reply/DefaultController.java (100%)
 rename {jdac => jda-commands}/src/test/java/reply/ReplyConfigTest.java (100%)

diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
index f97ab3707..a0d04ef5e 100644
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -21,4 +21,4 @@ jobs:
         uses: codacy/codacy-coverage-reporter-action@v1
         with:
           project-token: ${{ secrets.CODACY_PROJECT_TOKEN }}
-          coverage-reports: jdac/build/reports/jacoco/test/jacocoTestReport.xml
+          coverage-reports: jda-commands/build/reports/jacoco/test/jacocoTestReport.xml
diff --git a/.github/workflows/javadocs.yml b/.github/workflows/javadocs.yml
index 89aacdfb1..739b86b53 100644
--- a/.github/workflows/javadocs.yml
+++ b/.github/workflows/javadocs.yml
@@ -42,6 +42,6 @@ jobs:
         if: ${{ steps.target_dir.outputs.name != 'ignore' }}
         uses: JamesIves/github-pages-deploy-action@v4
         with:
-          folder: ./jdac/build/docs/javadoc
+          folder: ./jda-commands/build/docs/javadoc
           branch: docs
           target-folder: javadocs/${{ steps.target_dir.outputs.name }}
diff --git a/jdac/build.gradle.kts b/jda-commands/build.gradle.kts
similarity index 100%
rename from jdac/build.gradle.kts
rename to jda-commands/build.gradle.kts
diff --git a/jdac/src/examples/BanCommand.java b/jda-commands/src/examples/BanCommand.java
similarity index 100%
rename from jdac/src/examples/BanCommand.java
rename to jda-commands/src/examples/BanCommand.java
diff --git a/jdac/src/examples/CookieClicker.java b/jda-commands/src/examples/CookieClicker.java
similarity index 100%
rename from jdac/src/examples/CookieClicker.java
rename to jda-commands/src/examples/CookieClicker.java
diff --git a/jdac/src/examples/Main.java b/jda-commands/src/examples/Main.java
similarity index 100%
rename from jdac/src/examples/Main.java
rename to jda-commands/src/examples/Main.java
diff --git a/jdac/src/examples/embeds.json b/jda-commands/src/examples/embeds.json
similarity index 100%
rename from jdac/src/examples/embeds.json
rename to jda-commands/src/examples/embeds.json
diff --git a/jdac/src/examples/scope/PremiumCommand.java b/jda-commands/src/examples/scope/PremiumCommand.java
similarity index 100%
rename from jdac/src/examples/scope/PremiumCommand.java
rename to jda-commands/src/examples/scope/PremiumCommand.java
diff --git a/jdac/src/examples/scope/PremiumGuildsProvider.java b/jda-commands/src/examples/scope/PremiumGuildsProvider.java
similarity index 100%
rename from jdac/src/examples/scope/PremiumGuildsProvider.java
rename to jda-commands/src/examples/scope/PremiumGuildsProvider.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/JDACommands.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/JDACommands.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/JDACommands.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/JDACommands.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/JDACommandsBuilder.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/JDACommandsBuilder.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/JDACommandsBuilder.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/JDACommandsBuilder.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/Implementation.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/annotations/Implementation.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/Implementation.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/annotations/Implementation.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/Inject.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/annotations/Inject.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/Inject.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/annotations/Inject.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/Produces.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/annotations/Produces.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/Produces.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/annotations/Produces.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/Constraint.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/Constraint.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/Constraint.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/Constraint.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/Max.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/Max.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/Max.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/Max.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/Min.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/Min.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/Min.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/Min.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/NotPerm.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/NotPerm.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/NotPerm.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/NotPerm.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/NotRole.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/NotRole.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/NotRole.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/NotRole.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/NotUser.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/NotUser.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/NotUser.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/NotUser.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/Perm.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/Perm.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/Perm.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/Perm.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/Role.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/Role.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/Role.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/Role.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/User.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/User.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/User.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/User.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/package-info.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/package-info.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/package-info.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/annotations/constraints/package-info.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/AutoComplete.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/AutoComplete.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/AutoComplete.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/AutoComplete.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Button.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Button.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Button.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Button.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Choices.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Choices.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Choices.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Choices.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/CommandScope.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/CommandScope.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/CommandScope.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/CommandScope.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/ContextCommand.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/ContextCommand.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/ContextCommand.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/ContextCommand.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Cooldown.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Cooldown.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Cooldown.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Cooldown.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/EntitySelectMenu.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/EntitySelectMenu.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/EntitySelectMenu.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/EntitySelectMenu.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Interaction.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Interaction.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Interaction.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Interaction.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Modal.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Modal.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Modal.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Modal.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Optional.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Optional.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Optional.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Optional.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Param.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Param.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Param.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Param.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Permissions.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Permissions.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Permissions.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/Permissions.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/ReplyConfig.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/ReplyConfig.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/ReplyConfig.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/ReplyConfig.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/SelectOption.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/SelectOption.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/SelectOption.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/SelectOption.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/SlashCommand.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/SlashCommand.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/SlashCommand.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/SlashCommand.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/StringSelectMenu.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/StringSelectMenu.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/StringSelectMenu.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/StringSelectMenu.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/TextInput.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/TextInput.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/TextInput.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/TextInput.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/package-info.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/package-info.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/package-info.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/package-info.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/internal/SelectOptionContainer.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/annotations/internal/SelectOptionContainer.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/internal/SelectOptionContainer.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/annotations/internal/SelectOptionContainer.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/internal/package-info.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/annotations/internal/package-info.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/internal/package-info.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/annotations/internal/package-info.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/package-info.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/annotations/package-info.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/annotations/package-info.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/annotations/package-info.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/Definition.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/definitions/Definition.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/Definition.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/definitions/Definition.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/description/ClassDescription.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/definitions/description/ClassDescription.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/description/ClassDescription.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/definitions/description/ClassDescription.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/description/ClassFinder.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/definitions/description/ClassFinder.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/description/ClassFinder.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/definitions/description/ClassFinder.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/description/Description.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/definitions/description/Description.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/description/Description.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/definitions/description/Description.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/description/Descriptor.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/definitions/description/Descriptor.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/description/Descriptor.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/definitions/description/Descriptor.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/description/Invoker.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/definitions/description/Invoker.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/description/Invoker.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/definitions/description/Invoker.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/description/MethodDescription.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/definitions/description/MethodDescription.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/description/MethodDescription.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/definitions/description/MethodDescription.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/description/ParameterDescription.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/definitions/description/ParameterDescription.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/description/ParameterDescription.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/definitions/description/ParameterDescription.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/description/package-info.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/definitions/description/package-info.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/description/package-info.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/definitions/description/package-info.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/description/reflective/ReflectiveClassFinder.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/definitions/description/reflective/ReflectiveClassFinder.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/description/reflective/ReflectiveClassFinder.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/definitions/description/reflective/ReflectiveClassFinder.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/description/reflective/ReflectiveDescriptor.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/definitions/description/reflective/ReflectiveDescriptor.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/description/reflective/ReflectiveDescriptor.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/definitions/description/reflective/ReflectiveDescriptor.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/description/reflective/package-info.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/definitions/description/reflective/package-info.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/description/reflective/package-info.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/definitions/description/reflective/package-info.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/features/CustomIdJDAEntity.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/definitions/features/CustomIdJDAEntity.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/features/CustomIdJDAEntity.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/definitions/features/CustomIdJDAEntity.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/features/JDAEntity.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/definitions/features/JDAEntity.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/features/JDAEntity.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/definitions/features/JDAEntity.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/features/internal/Invokable.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/definitions/features/internal/Invokable.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/features/internal/Invokable.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/definitions/features/internal/Invokable.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/features/package-info.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/definitions/features/package-info.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/features/package-info.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/definitions/features/package-info.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/AutoCompleteDefinition.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/AutoCompleteDefinition.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/AutoCompleteDefinition.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/AutoCompleteDefinition.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/CustomId.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/CustomId.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/CustomId.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/CustomId.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/InteractionDefinition.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/InteractionDefinition.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/InteractionDefinition.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/InteractionDefinition.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/InteractionRegistry.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/InteractionRegistry.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/InteractionRegistry.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/InteractionRegistry.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/MethodBuildContext.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/MethodBuildContext.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/MethodBuildContext.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/MethodBuildContext.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/ModalDefinition.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/ModalDefinition.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/ModalDefinition.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/ModalDefinition.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/CommandDefinition.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/CommandDefinition.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/CommandDefinition.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/CommandDefinition.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/ContextCommandDefinition.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/ContextCommandDefinition.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/ContextCommandDefinition.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/ContextCommandDefinition.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/OptionDataDefinition.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/OptionDataDefinition.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/OptionDataDefinition.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/OptionDataDefinition.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/SlashCommandDefinition.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/SlashCommandDefinition.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/SlashCommandDefinition.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/SlashCommandDefinition.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/package-info.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/package-info.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/package-info.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/command/package-info.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/ButtonDefinition.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/ButtonDefinition.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/ButtonDefinition.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/ButtonDefinition.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/ComponentDefinition.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/ComponentDefinition.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/ComponentDefinition.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/ComponentDefinition.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/menu/EntitySelectMenuDefinition.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/menu/EntitySelectMenuDefinition.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/menu/EntitySelectMenuDefinition.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/menu/EntitySelectMenuDefinition.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/menu/SelectMenuDefinition.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/menu/SelectMenuDefinition.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/menu/SelectMenuDefinition.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/menu/SelectMenuDefinition.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/menu/StringSelectMenuDefinition.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/menu/StringSelectMenuDefinition.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/menu/StringSelectMenuDefinition.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/menu/StringSelectMenuDefinition.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/menu/package-info.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/menu/package-info.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/menu/package-info.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/menu/package-info.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/package-info.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/package-info.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/package-info.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/component/package-info.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/package-info.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/package-info.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/package-info.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/package-info.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/dependency/DefaultDependencyInjector.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/dependency/DefaultDependencyInjector.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/dependency/DefaultDependencyInjector.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/dependency/DefaultDependencyInjector.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/dependency/DependencyInjector.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/dependency/DependencyInjector.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/dependency/DependencyInjector.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/dependency/DependencyInjector.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/dependency/package-info.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/dependency/package-info.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/dependency/package-info.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/dependency/package-info.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/JDAEventListener.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/JDAEventListener.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/JDAEventListener.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/JDAEventListener.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/Runtime.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/Runtime.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/Runtime.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/Runtime.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/TypeAdapter.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/TypeAdapter.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/TypeAdapter.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/TypeAdapter.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/AudioChannelAdapter.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/AudioChannelAdapter.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/AudioChannelAdapter.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/AudioChannelAdapter.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/BooleanAdapter.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/BooleanAdapter.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/BooleanAdapter.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/BooleanAdapter.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/ByteAdapter.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/ByteAdapter.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/ByteAdapter.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/ByteAdapter.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/CharacterAdapter.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/CharacterAdapter.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/CharacterAdapter.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/CharacterAdapter.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/DoubleAdapter.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/DoubleAdapter.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/DoubleAdapter.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/DoubleAdapter.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/FloatAdapter.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/FloatAdapter.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/FloatAdapter.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/FloatAdapter.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/GuildChannelAdapter.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/GuildChannelAdapter.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/GuildChannelAdapter.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/GuildChannelAdapter.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/GuildMessageChannelAdapter.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/GuildMessageChannelAdapter.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/GuildMessageChannelAdapter.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/GuildMessageChannelAdapter.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/IntegerAdapter.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/IntegerAdapter.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/IntegerAdapter.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/IntegerAdapter.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/LongAdapter.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/LongAdapter.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/LongAdapter.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/LongAdapter.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/MemberAdapter.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/MemberAdapter.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/MemberAdapter.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/MemberAdapter.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/NewsChannelAdapter.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/NewsChannelAdapter.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/NewsChannelAdapter.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/NewsChannelAdapter.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/RoleAdapter.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/RoleAdapter.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/RoleAdapter.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/RoleAdapter.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/ShortAdapter.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/ShortAdapter.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/ShortAdapter.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/ShortAdapter.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/StageChannelAdapter.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/StageChannelAdapter.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/StageChannelAdapter.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/StageChannelAdapter.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/TextChannelAdapter.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/TextChannelAdapter.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/TextChannelAdapter.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/TextChannelAdapter.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/ThreadChannelAdapter.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/ThreadChannelAdapter.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/ThreadChannelAdapter.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/ThreadChannelAdapter.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/UserAdapter.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/UserAdapter.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/UserAdapter.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/UserAdapter.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/VoiceChannelAdapter.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/VoiceChannelAdapter.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/VoiceChannelAdapter.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/VoiceChannelAdapter.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/package-info.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/package-info.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/package-info.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/impl/package-info.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/internal/TypeAdapters.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/internal/TypeAdapters.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/internal/TypeAdapters.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/internal/TypeAdapters.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/package-info.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/package-info.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/package-info.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/adapter/package-info.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/context/InvocationContext.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/context/InvocationContext.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/context/InvocationContext.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/context/InvocationContext.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/context/KeyValueStore.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/context/KeyValueStore.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/context/KeyValueStore.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/context/KeyValueStore.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/Event.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/Event.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/Event.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/Event.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/ModalReplyableEvent.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/ModalReplyableEvent.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/ModalReplyableEvent.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/ModalReplyableEvent.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/ReplyableEvent.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/ReplyableEvent.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/ReplyableEvent.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/ReplyableEvent.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/interactions/AutoCompleteEvent.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/interactions/AutoCompleteEvent.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/interactions/AutoCompleteEvent.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/interactions/AutoCompleteEvent.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/interactions/CommandEvent.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/interactions/CommandEvent.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/interactions/CommandEvent.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/interactions/CommandEvent.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/interactions/ComponentEvent.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/interactions/ComponentEvent.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/interactions/ComponentEvent.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/interactions/ComponentEvent.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/interactions/ModalEvent.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/interactions/ModalEvent.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/interactions/ModalEvent.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/interactions/ModalEvent.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/interactions/package-info.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/interactions/package-info.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/interactions/package-info.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/interactions/package-info.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/package-info.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/package-info.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/package-info.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/events/package-info.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/expiration/ExpirationStrategy.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/expiration/ExpirationStrategy.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/expiration/ExpirationStrategy.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/expiration/ExpirationStrategy.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/AutoCompleteHandler.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/AutoCompleteHandler.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/AutoCompleteHandler.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/AutoCompleteHandler.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/ComponentHandler.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/ComponentHandler.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/ComponentHandler.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/ComponentHandler.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/DispatchingContext.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/DispatchingContext.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/DispatchingContext.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/DispatchingContext.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/EventHandler.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/EventHandler.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/EventHandler.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/EventHandler.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/ModalHandler.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/ModalHandler.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/ModalHandler.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/ModalHandler.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/command/ContextCommandHandler.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/command/ContextCommandHandler.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/command/ContextCommandHandler.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/command/ContextCommandHandler.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/command/SlashCommandHandler.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/command/SlashCommandHandler.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/command/SlashCommandHandler.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/command/SlashCommandHandler.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/command/package-info.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/command/package-info.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/command/package-info.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/command/package-info.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/package-info.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/package-info.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/package-info.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/handling/package-info.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/Middleware.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/Middleware.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/Middleware.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/Middleware.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/Priority.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/Priority.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/Priority.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/Priority.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/ConstraintMiddleware.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/ConstraintMiddleware.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/ConstraintMiddleware.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/ConstraintMiddleware.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/CooldownMiddleware.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/CooldownMiddleware.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/CooldownMiddleware.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/CooldownMiddleware.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/PermissionsMiddleware.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/PermissionsMiddleware.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/PermissionsMiddleware.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/PermissionsMiddleware.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/package-info.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/package-info.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/package-info.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/impl/package-info.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/internal/Middlewares.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/internal/Middlewares.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/internal/Middlewares.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/internal/Middlewares.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/package-info.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/package-info.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/package-info.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/middleware/package-info.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/package-info.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/package-info.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/package-info.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/package-info.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/Component.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/Component.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/Component.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/Component.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/ComponentReply.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/ComponentReply.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/ComponentReply.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/ComponentReply.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/ConfigurableReply.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/ConfigurableReply.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/ConfigurableReply.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/ConfigurableReply.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/MessageReply.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/MessageReply.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/MessageReply.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/MessageReply.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/Reply.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/Reply.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/Reply.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/Reply.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/package-info.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/package-info.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/package-info.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/reply/package-info.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/Validator.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/Validator.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/Validator.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/Validator.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/MaximumValidator.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/MaximumValidator.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/MaximumValidator.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/MaximumValidator.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/MinimumValidator.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/MinimumValidator.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/MinimumValidator.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/MinimumValidator.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/NotPermissionValidator.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/NotPermissionValidator.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/NotPermissionValidator.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/NotPermissionValidator.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/NotRoleValidator.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/NotRoleValidator.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/NotRoleValidator.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/NotRoleValidator.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/NotUserValidator.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/NotUserValidator.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/NotUserValidator.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/NotUserValidator.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/PermissionValidator.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/PermissionValidator.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/PermissionValidator.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/PermissionValidator.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/RoleValidator.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/RoleValidator.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/RoleValidator.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/RoleValidator.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/UserValidator.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/UserValidator.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/UserValidator.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/UserValidator.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/package-info.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/package-info.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/package-info.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/impl/package-info.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/internal/Validators.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/internal/Validators.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/internal/Validators.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/internal/Validators.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/package-info.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/package-info.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/package-info.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/dispatching/validation/package-info.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/embeds/EmbedCache.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/embeds/EmbedCache.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/embeds/EmbedCache.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/embeds/EmbedCache.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/embeds/EmbedDTO.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/embeds/EmbedDTO.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/embeds/EmbedDTO.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/embeds/EmbedDTO.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/embeds/error/DefaultErrorMessageFactory.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/embeds/error/DefaultErrorMessageFactory.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/embeds/error/DefaultErrorMessageFactory.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/embeds/error/DefaultErrorMessageFactory.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/embeds/error/ErrorMessageFactory.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/embeds/error/ErrorMessageFactory.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/embeds/error/ErrorMessageFactory.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/embeds/error/ErrorMessageFactory.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/embeds/error/JsonErrorMessageFactory.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/embeds/error/JsonErrorMessageFactory.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/embeds/error/JsonErrorMessageFactory.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/embeds/error/JsonErrorMessageFactory.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/embeds/error/package-info.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/embeds/error/package-info.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/embeds/error/package-info.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/embeds/error/package-info.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/embeds/package-info.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/embeds/package-info.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/embeds/package-info.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/embeds/package-info.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/internal/Helpers.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/internal/Helpers.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/internal/Helpers.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/internal/Helpers.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/internal/JDAContext.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/internal/JDAContext.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/internal/JDAContext.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/internal/JDAContext.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/internal/register/CommandTree.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/internal/register/CommandTree.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/internal/register/CommandTree.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/internal/register/CommandTree.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/internal/register/SlashCommandUpdater.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/internal/register/SlashCommandUpdater.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/internal/register/SlashCommandUpdater.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/internal/register/SlashCommandUpdater.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/internal/register/TreeNode.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/internal/register/TreeNode.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/internal/register/TreeNode.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/internal/register/TreeNode.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/package-info.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/package-info.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/package-info.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/package-info.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/permissions/DefaultPermissionsProvider.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/permissions/DefaultPermissionsProvider.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/permissions/DefaultPermissionsProvider.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/permissions/DefaultPermissionsProvider.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/permissions/PermissionsProvider.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/permissions/PermissionsProvider.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/permissions/PermissionsProvider.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/permissions/PermissionsProvider.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/permissions/package-info.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/permissions/package-info.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/permissions/package-info.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/permissions/package-info.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/scope/DefaultGuildScopeProvider.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/scope/DefaultGuildScopeProvider.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/scope/DefaultGuildScopeProvider.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/scope/DefaultGuildScopeProvider.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/scope/GuildScopeProvider.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/scope/GuildScopeProvider.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/scope/GuildScopeProvider.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/scope/GuildScopeProvider.java
diff --git a/jdac/src/main/java/com/github/kaktushose/jda/commands/scope/package-info.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/scope/package-info.java
similarity index 100%
rename from jdac/src/main/java/com/github/kaktushose/jda/commands/scope/package-info.java
rename to jda-commands/src/main/java/com/github/kaktushose/jda/commands/scope/package-info.java
diff --git a/jdac/src/main/java/module-info.java b/jda-commands/src/main/java/module-info.java
similarity index 100%
rename from jdac/src/main/java/module-info.java
rename to jda-commands/src/main/java/module-info.java
diff --git a/jdac/src/main/javadoc/doc-files/flowchart.png b/jda-commands/src/main/javadoc/doc-files/flowchart.png
similarity index 100%
rename from jdac/src/main/javadoc/doc-files/flowchart.png
rename to jda-commands/src/main/javadoc/doc-files/flowchart.png
diff --git a/jdac/src/main/javadoc/overview.md b/jda-commands/src/main/javadoc/overview.md
similarity index 100%
rename from jdac/src/main/javadoc/overview.md
rename to jda-commands/src/main/javadoc/overview.md
diff --git a/jdac/src/test/java/adapting/CustomType.java b/jda-commands/src/test/java/adapting/CustomType.java
similarity index 100%
rename from jdac/src/test/java/adapting/CustomType.java
rename to jda-commands/src/test/java/adapting/CustomType.java
diff --git a/jdac/src/test/java/adapting/CustomTypeAdapter.java b/jda-commands/src/test/java/adapting/CustomTypeAdapter.java
similarity index 100%
rename from jdac/src/test/java/adapting/CustomTypeAdapter.java
rename to jda-commands/src/test/java/adapting/CustomTypeAdapter.java
diff --git a/jdac/src/test/java/adapting/TypeAdapterRegistryTest.java b/jda-commands/src/test/java/adapting/TypeAdapterRegistryTest.java
similarity index 100%
rename from jdac/src/test/java/adapting/TypeAdapterRegistryTest.java
rename to jda-commands/src/test/java/adapting/TypeAdapterRegistryTest.java
diff --git a/jdac/src/test/java/adapting/TypeAdapterTest.java b/jda-commands/src/test/java/adapting/TypeAdapterTest.java
similarity index 100%
rename from jdac/src/test/java/adapting/TypeAdapterTest.java
rename to jda-commands/src/test/java/adapting/TypeAdapterTest.java
diff --git a/jdac/src/test/java/adapting/mock/CacheRestActionMock.java b/jda-commands/src/test/java/adapting/mock/CacheRestActionMock.java
similarity index 100%
rename from jdac/src/test/java/adapting/mock/CacheRestActionMock.java
rename to jda-commands/src/test/java/adapting/mock/CacheRestActionMock.java
diff --git a/jdac/src/test/java/adapting/mock/GuildMock.java b/jda-commands/src/test/java/adapting/mock/GuildMock.java
similarity index 100%
rename from jdac/src/test/java/adapting/mock/GuildMock.java
rename to jda-commands/src/test/java/adapting/mock/GuildMock.java
diff --git a/jdac/src/test/java/adapting/mock/JDACommandsMock.java b/jda-commands/src/test/java/adapting/mock/JDACommandsMock.java
similarity index 100%
rename from jdac/src/test/java/adapting/mock/JDACommandsMock.java
rename to jda-commands/src/test/java/adapting/mock/JDACommandsMock.java
diff --git a/jdac/src/test/java/adapting/mock/JDAMock.java b/jda-commands/src/test/java/adapting/mock/JDAMock.java
similarity index 100%
rename from jdac/src/test/java/adapting/mock/JDAMock.java
rename to jda-commands/src/test/java/adapting/mock/JDAMock.java
diff --git a/jdac/src/test/java/adapting/mock/MemberMock.java b/jda-commands/src/test/java/adapting/mock/MemberMock.java
similarity index 100%
rename from jdac/src/test/java/adapting/mock/MemberMock.java
rename to jda-commands/src/test/java/adapting/mock/MemberMock.java
diff --git a/jdac/src/test/java/adapting/mock/RestActionMock.java b/jda-commands/src/test/java/adapting/mock/RestActionMock.java
similarity index 100%
rename from jdac/src/test/java/adapting/mock/RestActionMock.java
rename to jda-commands/src/test/java/adapting/mock/RestActionMock.java
diff --git a/jdac/src/test/java/adapting/mock/RoleMock.java b/jda-commands/src/test/java/adapting/mock/RoleMock.java
similarity index 100%
rename from jdac/src/test/java/adapting/mock/RoleMock.java
rename to jda-commands/src/test/java/adapting/mock/RoleMock.java
diff --git a/jdac/src/test/java/adapting/mock/SlashCommandInteractionEventMock.java b/jda-commands/src/test/java/adapting/mock/SlashCommandInteractionEventMock.java
similarity index 100%
rename from jdac/src/test/java/adapting/mock/SlashCommandInteractionEventMock.java
rename to jda-commands/src/test/java/adapting/mock/SlashCommandInteractionEventMock.java
diff --git a/jdac/src/test/java/adapting/mock/SlashCommandInteractionMock.java b/jda-commands/src/test/java/adapting/mock/SlashCommandInteractionMock.java
similarity index 100%
rename from jdac/src/test/java/adapting/mock/SlashCommandInteractionMock.java
rename to jda-commands/src/test/java/adapting/mock/SlashCommandInteractionMock.java
diff --git a/jdac/src/test/java/adapting/mock/TextChannelMock.java b/jda-commands/src/test/java/adapting/mock/TextChannelMock.java
similarity index 100%
rename from jdac/src/test/java/adapting/mock/TextChannelMock.java
rename to jda-commands/src/test/java/adapting/mock/TextChannelMock.java
diff --git a/jdac/src/test/java/adapting/mock/TypeAdapterRegistryTestController.java b/jda-commands/src/test/java/adapting/mock/TypeAdapterRegistryTestController.java
similarity index 100%
rename from jdac/src/test/java/adapting/mock/TypeAdapterRegistryTestController.java
rename to jda-commands/src/test/java/adapting/mock/TypeAdapterRegistryTestController.java
diff --git a/jdac/src/test/java/adapting/mock/UserMock.java b/jda-commands/src/test/java/adapting/mock/UserMock.java
similarity index 100%
rename from jdac/src/test/java/adapting/mock/UserMock.java
rename to jda-commands/src/test/java/adapting/mock/UserMock.java
diff --git a/jdac/src/test/java/commands/CommandDefinitionTestController.java b/jda-commands/src/test/java/commands/CommandDefinitionTestController.java
similarity index 100%
rename from jdac/src/test/java/commands/CommandDefinitionTestController.java
rename to jda-commands/src/test/java/commands/CommandDefinitionTestController.java
diff --git a/jdac/src/test/java/commands/SlashCommandDefinitionTest.java b/jda-commands/src/test/java/commands/SlashCommandDefinitionTest.java
similarity index 100%
rename from jdac/src/test/java/commands/SlashCommandDefinitionTest.java
rename to jda-commands/src/test/java/commands/SlashCommandDefinitionTest.java
diff --git a/jdac/src/test/java/commands/UnsupportedType.java b/jda-commands/src/test/java/commands/UnsupportedType.java
similarity index 100%
rename from jdac/src/test/java/commands/UnsupportedType.java
rename to jda-commands/src/test/java/commands/UnsupportedType.java
diff --git a/jdac/src/test/java/dependency/Dependency.java b/jda-commands/src/test/java/dependency/Dependency.java
similarity index 100%
rename from jdac/src/test/java/dependency/Dependency.java
rename to jda-commands/src/test/java/dependency/Dependency.java
diff --git a/jdac/src/test/java/dependency/DependencyInjectorTest.java b/jda-commands/src/test/java/dependency/DependencyInjectorTest.java
similarity index 100%
rename from jdac/src/test/java/dependency/DependencyInjectorTest.java
rename to jda-commands/src/test/java/dependency/DependencyInjectorTest.java
diff --git a/jdac/src/test/java/dependency/InjectableClass.java b/jda-commands/src/test/java/dependency/InjectableClass.java
similarity index 100%
rename from jdac/src/test/java/dependency/InjectableClass.java
rename to jda-commands/src/test/java/dependency/InjectableClass.java
diff --git a/jdac/src/test/java/dependency/ProducingClass.java b/jda-commands/src/test/java/dependency/ProducingClass.java
similarity index 100%
rename from jdac/src/test/java/dependency/ProducingClass.java
rename to jda-commands/src/test/java/dependency/ProducingClass.java
diff --git a/jdac/src/test/java/dependency/WrongProducingClass.java b/jda-commands/src/test/java/dependency/WrongProducingClass.java
similarity index 100%
rename from jdac/src/test/java/dependency/WrongProducingClass.java
rename to jda-commands/src/test/java/dependency/WrongProducingClass.java
diff --git a/jdac/src/test/java/parameters/OptionDataDefinitionTest.java b/jda-commands/src/test/java/parameters/OptionDataDefinitionTest.java
similarity index 100%
rename from jdac/src/test/java/parameters/OptionDataDefinitionTest.java
rename to jda-commands/src/test/java/parameters/OptionDataDefinitionTest.java
diff --git a/jdac/src/test/java/parameters/ParameterTestController.java b/jda-commands/src/test/java/parameters/ParameterTestController.java
similarity index 100%
rename from jdac/src/test/java/parameters/ParameterTestController.java
rename to jda-commands/src/test/java/parameters/ParameterTestController.java
diff --git a/jdac/src/test/java/reply/CustomController.java b/jda-commands/src/test/java/reply/CustomController.java
similarity index 100%
rename from jdac/src/test/java/reply/CustomController.java
rename to jda-commands/src/test/java/reply/CustomController.java
diff --git a/jdac/src/test/java/reply/DefaultController.java b/jda-commands/src/test/java/reply/DefaultController.java
similarity index 100%
rename from jdac/src/test/java/reply/DefaultController.java
rename to jda-commands/src/test/java/reply/DefaultController.java
diff --git a/jdac/src/test/java/reply/ReplyConfigTest.java b/jda-commands/src/test/java/reply/ReplyConfigTest.java
similarity index 100%
rename from jdac/src/test/java/reply/ReplyConfigTest.java
rename to jda-commands/src/test/java/reply/ReplyConfigTest.java
diff --git a/settings.gradle.kts b/settings.gradle.kts
index d176026f2..4723872f1 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -5,4 +5,4 @@
  */
 
 rootProject.name = "jda-commands"
-include("jdac")
+include("jda-commands")

From 0591e442f1c9142a08f1150fbde2b5bc5c4bd607 Mon Sep 17 00:00:00 2001
From: Kaktushose <42280757+Kaktushose@users.noreply.github.com>
Date: Sun, 12 Jan 2025 20:41:25 +0100
Subject: [PATCH 36/38] fix required fields for TextInput [#155]

---
 .../commands/annotations/interactions/TextInput.java   | 10 +++++-----
 .../definitions/interactions/ModalDefinition.java      |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/jda-commands/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/TextInput.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/TextInput.java
index 156b597b1..6d8da596b 100644
--- a/jda-commands/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/TextInput.java
+++ b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/annotations/interactions/TextInput.java
@@ -14,17 +14,17 @@
 @Retention(RetentionPolicy.RUNTIME)
 public @interface TextInput {
 
-    /// The placeholder of this TextInput
-    ///
-    /// This is the short hint that describes the expected value of the TextInput field.
+    /// The label shown above this text input box.
     ///
     /// @return Placeholder
     String value();
 
-    /// The label shown above this text input box
+    /// The placeholder of this TextInput.
+    ///
+    /// This is the short hint that describes the expected value of the TextInput field.
     ///
     /// @return Label for the input
-    String label() default "";
+    String placeholder() default "";
 
     /// The default value of this TextInput.
     ///
diff --git a/jda-commands/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/ModalDefinition.java b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/ModalDefinition.java
index a6652cba5..df9563926 100644
--- a/jda-commands/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/ModalDefinition.java
+++ b/jda-commands/src/main/java/com/github/kaktushose/jda/commands/definitions/interactions/ModalDefinition.java
@@ -125,8 +125,8 @@ public static Optional<TextInputDefinition> build(ParameterDescription parameter
             var textInput = optional.get();
 
             return Optional.of(new TextInputDefinition(
-                    textInput.label().isEmpty() ? parameter.name() : textInput.label(),
-                    textInput.value(),
+                    textInput.value().isEmpty() ? parameter.name() : textInput.value(),
+                    textInput.placeholder(),
                     textInput.defaultValue(),
                     textInput.minValue(),
                     textInput.maxValue(),

From 5258526aace10bc96685f53e7020ea13a9314aaa Mon Sep 17 00:00:00 2001
From: Kaktushose <42280757+Kaktushose@users.noreply.github.com>
Date: Tue, 7 Jan 2025 21:10:40 +0100
Subject: [PATCH 37/38] update javadocs link in readme

(cherry picked from commit 7a34f617ced3e9a4bb718f4d6811db71cba9c7f0)
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index c27981e5a..aa7e8a9d0 100644
--- a/README.md
+++ b/README.md
@@ -73,7 +73,7 @@ JDACommands.start(jda, Main.class);
 ---
 
 If you want to learn more, check out the [Wiki](https://github.com/Kaktushose/jda-commands/wiki) or
-the [Javadoc](https://kaktushose.github.io/jda-commands/).
+the [Javadoc](https://kaktushose.github.io/jda-commands/javadocs/latest/).
 
 ## Download
 

From 743c74da6514bda66995af2f2191da8ed618478d Mon Sep 17 00:00:00 2001
From: Kaktushose <42280757+Kaktushose@users.noreply.github.com>
Date: Sun, 12 Jan 2025 20:58:22 +0100
Subject: [PATCH 38/38] update version

---
 README.md                     |   4 +-
 jda-commands/build.gradle.kts |   2 +-
 pom.xml.old                   | 131 ----------------------------------
 3 files changed, 3 insertions(+), 134 deletions(-)
 delete mode 100644 pom.xml.old

diff --git a/README.md b/README.md
index aa7e8a9d0..3ef5cec80 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 [![JDA-Version](https://img.shields.io/badge/JDA%20Version-5.2.2-important)](https://github.com/DV8FromTheWorld/JDA#download)
-[![Generic badge](https://img.shields.io/badge/Download-4.0.0--beta.3-green.svg)](https://github.com/Kaktushose/jda-commands/releases/latest)
+[![Generic badge](https://img.shields.io/badge/Download-4.0.0--beta.4-green.svg)](https://github.com/Kaktushose/jda-commands/releases/latest)
 [![Java CI](https://github.com/Kaktushose/jda-commands/actions/workflows/ci.yml/badge.svg?branch=main)](https://github.com/Kaktushose/jda-commands/actions/workflows/ci.yml)
 [![Codacy Badge](https://app.codacy.com/project/badge/Grade/f2b4367f6d0f42d89b7e51331f3ce299)](https://app.codacy.com/gh/Kaktushose/jda-commands/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_grade)
 [![Codacy Badge](https://app.codacy.com/project/badge/Coverage/f2b4367f6d0f42d89b7e51331f3ce299)](https://app.codacy.com/gh/Kaktushose/jda-commands/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_coverage)
@@ -15,7 +15,7 @@ any boilerplate code, so you can focus solely on the business logic of your bot
 
 | jda-commands                                                               | JDA | Text Commands | Interactions |
 |----------------------------------------------------------------------------|-----|---------------|--------------|
-| [4.0.0-beta.3](https://github.com/Kaktushose/jda-commands/releases/latest) | 5   | ❌             | ✅            |
+| [4.0.0-beta.4](https://github.com/Kaktushose/jda-commands/releases/latest) | 5   | ❌             | ✅            |
 | [3.0.0](https://github.com/Kaktushose/jda-commands/releases/tag/v3.0.0)    | 5   | ✅             | ❌            |
 | [2.2.0](https://github.com/Kaktushose/jda-commands/releases/tag/v.2.0.0)   | 4   | ✅             | ❌            |
 
diff --git a/jda-commands/build.gradle.kts b/jda-commands/build.gradle.kts
index 808342154..45ff3763d 100644
--- a/jda-commands/build.gradle.kts
+++ b/jda-commands/build.gradle.kts
@@ -24,7 +24,7 @@ dependencies {
 }
 
 group = "com.github.kaktushose"
-version = "4.0.0-beta.3"
+version = "4.0.0-beta.4"
 description = "jda-commands"
 
 publishing {
diff --git a/pom.xml.old b/pom.xml.old
deleted file mode 100644
index 234c4bae3..000000000
--- a/pom.xml.old
+++ /dev/null
@@ -1,131 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <groupId>com.github.kaktushose</groupId>
-    <artifactId>jda-commands</artifactId>
-    <version>4.0.0-beta.3</version>
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.10.1</version>
-                <configuration>
-                    <source>23</source>
-                    <target>23</target>
-                    <compilerArgs>
-                        <arg>-parameters</arg>
-                    </compilerArgs>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.0.0-M6</version>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.3.2</version>
-                <configuration>
-                    <source>23</source>
-                    <doclint>none</doclint>
-                    <overview>${basedir}/src/main/javadoc/overview.md</overview>
-                    <links>
-                        <link>https://javadoc.io/doc/net.dv8tion/JDA/5.0.2</link>
-                    </links>
-                    <docfilessubdirs>true</docfilessubdirs>
-                    <tags>
-                        <tag>
-                            <name>apiNote</name>
-                            <placement>a</placement>
-                            <head>API Note:</head>
-                        </tag>
-                        <tag>
-                            <name>implSpec</name>
-                            <placement>a</placement>
-                            <head>Implementation Requirements:</head>
-                        </tag>
-                        <tag>
-                            <name>implNote</name>
-                            <placement>a</placement>
-                            <head>Implementation Note:</head>
-                        </tag>
-                    </tags>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.jacoco</groupId>
-                <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.8.12</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>prepare-agent</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>generate-code-coverage-report</id>
-                        <phase>test</phase>
-                        <goals>
-                            <goal>report</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-    <dependencies>
-        <dependency>
-            <groupId>net.dv8tion</groupId>
-            <artifactId>JDA</artifactId>
-            <version>5.2.2</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>club.minnced</groupId>
-                    <artifactId>opus-java</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.reflections</groupId>
-            <artifactId>reflections</artifactId>
-            <version>0.10.2</version>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <version>2.0.5</version>
-        </dependency>
-        <dependency>
-            <groupId>com.google.code.gson</groupId>
-            <artifactId>gson</artifactId>
-            <version>2.10.1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-api</artifactId>
-            <version>5.9.2</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-engine</artifactId>
-            <version>5.9.2</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.jetbrains</groupId>
-            <artifactId>annotations</artifactId>
-            <version>24.0.1</version>
-        </dependency>
-    </dependencies>
-</project>