diff --git a/Bukkit/src/main/java/net/frankheijden/serverutils/bukkit/entities/BukkitPlugin.java b/Bukkit/src/main/java/net/frankheijden/serverutils/bukkit/entities/BukkitPlugin.java
index ed543d3..88ceaf2 100644
--- a/Bukkit/src/main/java/net/frankheijden/serverutils/bukkit/entities/BukkitPlugin.java
+++ b/Bukkit/src/main/java/net/frankheijden/serverutils/bukkit/entities/BukkitPlugin.java
@@ -58,12 +58,12 @@ public class BukkitPlugin extends ServerUtilsPlugin<Plugin, BukkitTask, BukkitAu
             throw new RuntimeException(ex);
         }
 
-        if (commandManager.queryCapability(CloudBukkitCapabilities.BRIGADIER)) {
+        if (commandManager.hasCapability(CloudBukkitCapabilities.BRIGADIER)) {
             commandManager.registerBrigadier();
             handleBrigadier(commandManager.brigadierManager());
         }
 
-        if (commandManager.queryCapability(CloudBukkitCapabilities.ASYNCHRONOUS_COMPLETION)) {
+        if (commandManager.hasCapability(CloudBukkitCapabilities.ASYNCHRONOUS_COMPLETION)) {
             commandManager.registerAsynchronousCompletions();
         }
 
diff --git a/build.gradle.kts b/build.gradle.kts
index 0707cc0..ab17831 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -39,7 +39,7 @@ subprojects {
         implementation("cloud.commandframework:cloud-brigadier:${VersionConstants.cloudVersion}")
         implementation("com.github.FrankHeijden:MinecraftReflection:1.0.0")
         implementation("com.google.code.gson:gson:2.8.6")
-        implementation("me.lucko:commodore:1.13")
+        implementation("me.lucko:commodore:2.0")
         compileOnly("com.mojang:brigadier:1.0.18")
 
         testImplementation("org.assertj:assertj-core:3.18.1")
@@ -55,6 +55,7 @@ subprojects {
 
         compileJava {
             options.encoding = Charsets.UTF_8.name()
+            options.isDeprecation = true
         }
 
         javadoc {