@@ -1,7 +1,8 @@
 package net.javadiscord.javabot2.command.interaction.button;
 
-import org.javacord.api.entity.message.component.ActionRow;
+import org.javacord.api.entity.emoji.Emoji;
 import org.javacord.api.entity.message.component.Button;
+import org.javacord.api.entity.message.component.ButtonBuilder;
 import org.javacord.api.entity.message.component.ButtonStyle;
 
 import java.util.ArrayList;
@@ -13,6 +14,9 @@ public class ButtonAction {
     private final ButtonStyle buttonStyle;
     private Class<? extends ButtonHandler> handler;
     private final List<String> params;
+    private boolean disabled = false;
+    private String url;
+    private Emoji emoji;
 
     public ButtonAction(String label, ButtonStyle buttonStyle) {
         this.params = new ArrayList<>();
@@ -31,6 +35,21 @@ public ButtonAction addParam(Object param) {
         return this;
     }
 
+    public ButtonAction setDisabled(boolean disabled) {
+        this.disabled = disabled;
+        return this;
+    }
+
+    public ButtonAction setUrl(String url) {
+        this.url = url;
+        return this;
+    }
+
+    public ButtonAction setEmoji(Emoji emoji) {
+        this.emoji = emoji;
+        return this;
+    }
+
     public String getCustomId() {
         StringBuilder id = new StringBuilder(handler.getName());
         for (String param : params) {
@@ -47,5 +66,15 @@ public String getCustomId() {
 
     public List<String> getParams() { return params; }
 
-    public Button getButton() { return Button.create(getCustomId(), buttonStyle, label); }
+    public Button getButton() {
+        var builder = new ButtonBuilder()
+                .setLabel(label)
+                .setStyle(buttonStyle)
+                .setDisabled(disabled);
+        if (buttonStyle != ButtonStyle.LINK) builder.setCustomId(getCustomId());
+        if (url != null && !url.isBlank() && !url.isEmpty() && buttonStyle == ButtonStyle.LINK) builder.setUrl(url);
+        if (emoji != null) builder.setEmoji(emoji);
+
+        return builder.build();
+    }
 }
@@ -2,6 +2,7 @@
 
 import org.javacord.api.entity.message.component.ActionRow;
 import org.javacord.api.entity.message.component.SelectMenu;
+import org.javacord.api.entity.message.component.SelectMenuBuilder;
 import org.javacord.api.entity.message.component.SelectMenuOption;
 
 import java.util.ArrayList;
@@ -67,13 +68,13 @@ public String getCustomId() {
     public SelectMenu getSelectMenu() {
         if (options.isEmpty()) throw new IllegalStateException("SelectMenu options may not be empty!");
         if (minValue > maxValue) throw new IllegalArgumentException("minValue may not be greater than maxValue!");
-        return SelectMenu.create(
-                getCustomId(),
-                placeholder,
-                minValue,
-                Math.min(maxValue, options.size()), // maxValue cannot be greater than the provided amount of options
-                options,
-                disabled
-        );
+        return new SelectMenuBuilder()
+                .setCustomId(getCustomId())
+                .setPlaceholder(placeholder)
+                .setMinimumValues(minValue)
+                .setMaximumValues(Math.min(maxValue, options.size())) // maxValue cannot be greater than the provided amount of options
+                .addOptions(options)
+                .setDisabled(disabled)
+                .build();
     }
 }