diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index bf0f006..330241a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -8,29 +8,29 @@ jobs:
   build:
     strategy:
       matrix:
-        java: [ "17" ]
+        java: [ "21" ]
         os: [ "ubuntu-latest" ]
 
     runs-on: ${{ matrix.os }}
     steps:
       - name: "checkout"
-        uses: actions/checkout@v3
+        uses: actions/checkout@v5
 
       - name: "setup java"
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v5
         with:
           java-version: ${{ matrix.java }}
-          distribution: 'adopt'
+          distribution: 'zulu'
           cache: gradle
 
       - name: "validate gradle wrapper"
-        uses: gradle/wrapper-validation-action@v1
+        uses: gradle/actions/wrapper-validation@v3
 
       - name: gradle build
         run: ./gradlew clean build
 
       # Upload Artifacts
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         with:
           name: message
           path: build/libs
@@ -38,24 +38,24 @@ jobs:
   publish:
     strategy:
       matrix:
-        java: [ "17" ]
+        java: [ "21" ]
         os: [ "ubuntu-latest" ]
 
     needs: build
     runs-on: ${{ matrix.os }}
     steps:
       - name: "checkout"
-        uses: actions/checkout@v3
+        uses: actions/checkout@v5
 
       - name: "setup java"
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v5
         with:
           java-version: ${{ matrix.java }}
-          distribution: 'adopt'
+          distribution: 'zulu'
           cache: gradle
 
       - name: "validate gradle wrapper"
-        uses: gradle/wrapper-validation-action@v1
+        uses: gradle/actions/wrapper-validation@v3
 
       - name: gradle publish
         run: ./gradlew build publish publishAllPublicationsToHangar
diff --git a/.github/workflows/pr_build.yml b/.github/workflows/pr_build.yml
index 05f2043..7e47157 100644
--- a/.github/workflows/pr_build.yml
+++ b/.github/workflows/pr_build.yml
@@ -7,24 +7,24 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: "checkout"
-        uses: actions/checkout@v3
+        uses: actions/checkout@v5
 
       - name: "setup jdk"
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v5
         with:
-          java-version: 17
-          distribution: 'adopt'
+          java-version: 21
+          distribution: 'zulu'
           cache: gradle
 
       - name: "validate gradle wrapper"
-        uses: gradle/wrapper-validation-action@v1
+        uses: gradle/actions/wrapper-validation@v3
 
       - name: "build with gradle"
         run: ./gradlew clean build
 
       # Upload Artifacts
       - name: "upload artifacts"
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: message-pr-${{ github.event.pullrequest.number }}
           path: build/libs
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 106f310..7ca629f 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -8,26 +8,26 @@ jobs:
   release:
     strategy:
       matrix:
-        java: [ "17" ]
+        java: [ "21" ]
         os: [ "ubuntu-latest" ]
 
     runs-on: ${{ matrix.os }}
     steps:
       - name: "checkout"
-        uses: actions/checkout@v3
+        uses: actions/checkout@v5
 
       - name: "setup jdk ${{ matrix.java }}"
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v5
         with:
           java-version: ${{ matrix.java }}
-          distribution: 'adopt'
+          distribution: 'zulu'
           cache: gradle
 
       - name: "validate gradle wrapper"
-        uses: gradle/wrapper-validation-action@v1
+        uses: gradle/actions/wrapper-validation@v3
 
       - name: "setup gradle"
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/actions/setup-gradle@v3
 
       - name: "gradle build and publish"
         run: ./gradlew clean build publish publishAllPublicationsToHangar
@@ -39,7 +39,7 @@ jobs:
           HANGAR_API_KEY: ${{ SECRETS.HANGAR_API_KEY }}
 
       - name: upload artifacts
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: message
           path: build/libs/*.jar
@@ -47,7 +47,7 @@ jobs:
 
       # Release Artifacts
       - name: release artifacts
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         with:
           tag_name: ${{ github.event.release.tag_name }}
           files: build/libs/*.jar
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
index 3c73dbc..0c5b006 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,26 +1,26 @@
 import io.papermc.hangarpublishplugin.model.Platforms
 import java.io.*
+import java.util.Date
 
 plugins {
     java
-    id("com.github.johnrengelman.shadow") version "7.1.2"
+    id("com.gradleup.shadow") version "9.2.2"
     `maven-publish`
-    id("xyz.jpenilla.run-velocity") version "2.0.0"
+    id("xyz.jpenilla.run-velocity") version "3.0.2"
     id("io.papermc.hangar-publish-plugin") version "0.0.4"
 }
 
 repositories {
-    mavenCentral()
     maven("https://repo.papermc.io/repository/maven-public/")
 }
 
 dependencies {
-    implementation("org.bstats:bstats-velocity:3.0.1")
-    implementation("com.velocitypowered:velocity-api:3.1.2-SNAPSHOT")
-    implementation("cloud.commandframework:cloud-velocity:1.8.2")
-    implementation("cloud.commandframework:cloud-minecraft-extras:1.8.2")
-    compileOnly("net.luckperms:api:5.4")
-    compileOnly("io.github.miniplaceholders:miniplaceholders-api:2.0.0")
+    implementation("org.bstats:bstats-velocity:3.1.0")
+    implementation("com.velocitypowered:velocity-api:3.4.0-SNAPSHOT")
+    implementation("org.incendo:cloud-velocity:2.0.0-SNAPSHOT") {}
+    implementation("org.incendo:cloud-minecraft-extras:2.0.0-SNAPSHOT")
+    compileOnly("net.luckperms:api:5.5")
+    compileOnly("io.github.miniplaceholders:miniplaceholders-api:3.1.0")
 }
 
 fun runCommand(command: String): String {
@@ -48,6 +48,11 @@ if (!release) {
 
 
 tasks {
+    compileJava {
+        options.encoding = Charsets.UTF_8.name()
+        options.release.set(21)
+    }
+
     processResources {
         expand("project" to project)
     }
@@ -55,31 +60,44 @@ tasks {
     shadowJar {
         dependencies {
             include {
-                it.moduleGroup == "org.bstats" || it.moduleGroup == "cloud.commandframework" || it.moduleGroup == "io.leangen.geantyref"
+                it.moduleGroup == "org.bstats" || it.moduleGroup == "org.incendo" || it.moduleGroup == "io.leangen.geantyref"
+            }
+            exclude{
+                it.moduleGroup == "io.leangen.geantyref"
             }
         }
         relocate("org.bstats", "com.oskarsmc.message.relocated.bstats")
-        relocate("cloud.commandframework", "com.oskarsmc.message.relocated.cloud")
-        relocate("io.leangen.geantyref", "com.oskarsmc.message.relocated.geantyref")
+        relocate("org.incendo", "com.oskarsmc.message.relocated.incendo")
+        //relocate("io.leangen.geantyref", "com.oskarsmc.message.relocated.geantyref")
     }
 
     build {
-        dependsOn(named("shadowJar"))
+        dependsOn(shadowJar)
     }
 
     runVelocity {
         // Configure the Velocity version for our task.
         // This is the only required configuration besides applying the plugin.
         // Your plugin's jar (or shadowJar if present) will be used automatically.
-        velocityVersion("3.1.2-SNAPSHOT")
+        velocityVersion("3.4.0-SNAPSHOT")
+    }
+
+    jar {
+        manifest {
+            attributes(
+                "Implementation-Title" to "message",
+                "Implementation-Version" to project.version,
+                "Implementation-Build-Date" to Date(),
+                "Implementation-Vendor" to "OskarsMC"
+            )
+        }
     }
 }
 
-val jar by tasks.getting(Jar::class) {
-    manifest {
-        attributes["Implementation-Title"] = "message"
-        attributes["Implementation-Version"] = project.version
-        attributes["Implementation-Vendor"] = "OskarsMC"
+java {
+    toolchain{
+        languageVersion.set(JavaLanguageVersion.of(21))
+        vendor.set(JvmVendorSpec.AZUL)
     }
 }
 
@@ -120,7 +138,7 @@ hangarPublish {
             platforms {
                 register(Platforms.VELOCITY) {
                     jar.set(tasks.shadowJar.flatMap { it.archiveFile })
-                    platformVersions.set(listOf("3.2"))
+                    platformVersions.set(listOf("3.4"))
                 }
             }
         }
@@ -137,7 +155,7 @@ hangarPublish {
             platforms {
                 register(Platforms.VELOCITY) {
                     jar.set(tasks.shadowJar.flatMap { it.archiveFile })
-                    platformVersions.set(listOf("3.2"))
+                    platformVersions.set(listOf("3.4"))
                 }
             }
         }
diff --git a/docs/TECHNICAL.md b/docs/TECHNICAL.md
index f6512be..d0ff7e5 100644
--- a/docs/TECHNICAL.md
+++ b/docs/TECHNICAL.md
@@ -11,9 +11,9 @@
 
 ## Java
 
-Recommended Version: 17
+Recommended Version: 21
 
-Tested Versions: 16, 17
+Tested Versions: 21, 25
 
 ## API
 
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 7454180..8bdaf60 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index e1bef7e..2e11132 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 1b6c787..adff685 100755
--- a/gradlew
+++ b/gradlew
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright © 2015 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.
@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       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/.
@@ -80,13 +82,11 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-
-# 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"'
+# 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\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -114,7 +114,6 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 
 # Determine the Java command to use to start the JVM.
@@ -133,22 +132,29 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    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
@@ -165,7 +171,6 @@ fi
 # 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" )
 
@@ -193,18 +198,27 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+
+# 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, 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 \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
+# 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.
diff --git a/gradlew.bat b/gradlew.bat
index ac1b06f..e509b2d 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -13,8 +13,10 @@
 @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
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +27,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,13 +43,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+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
 
@@ -56,32 +59,33 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+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 %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+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!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+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
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 8ed01f2..e1e5a71 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,2 +1,5 @@
 rootProject.name = "message"
 
+plugins {
+    id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0"
+}
diff --git a/src/main/java/com/oskarsmc/message/Message.java b/src/main/java/com/oskarsmc/message/Message.java
index a0cb216..a4128af 100644
--- a/src/main/java/com/oskarsmc/message/Message.java
+++ b/src/main/java/com/oskarsmc/message/Message.java
@@ -1,8 +1,9 @@
 package com.oskarsmc.message;
 
-import cloud.commandframework.execution.CommandExecutionCoordinator;
-import cloud.commandframework.velocity.CloudInjectionModule;
-import cloud.commandframework.velocity.VelocityCommandManager;
+import org.incendo.cloud.SenderMapper;
+import org.incendo.cloud.execution.ExecutionCoordinator;
+import org.incendo.cloud.velocity.CloudInjectionModule;
+import org.incendo.cloud.velocity.VelocityCommandManager;
 import com.google.inject.Inject;
 import com.google.inject.Injector;
 import com.google.inject.Key;
@@ -26,7 +27,6 @@
 import org.slf4j.Logger;
 
 import java.nio.file.Path;
-import java.util.function.Function;
 
 /**
  * The main class for the message plugin.
@@ -54,9 +54,8 @@ public void onProxyInitialization(ProxyInitializeEvent event) {
         injector = injector.createChildInjector(
                 new CloudInjectionModule<>(
                         CommandSource.class,
-                        CommandExecutionCoordinator.simpleCoordinator(),
-                        Function.identity(),
-                        Function.identity()
+                        ExecutionCoordinator.simpleCoordinator(),
+                        SenderMapper.identity()
                 ),
                 new MessageModule(messageSettings)
         );
@@ -87,7 +86,7 @@ public void onProxyInitialization(ProxyInitializeEvent event) {
 
             // Allow autocompletion regardless of capitalisation
             injector.getInstance(Key.get(new TypeLiteral<VelocityCommandManager<CommandSource>>() {
-            })).commandSuggestionProcessor(new CloudSuggestionProcessor());
+            })).suggestionProcessor(new CloudSuggestionProcessor());
 
             // Commands
             injector.getInstance(MessageCommand.class);
diff --git a/src/main/java/com/oskarsmc/message/command/MessageCommand.java b/src/main/java/com/oskarsmc/message/command/MessageCommand.java
index e08902e..9b832f9 100644
--- a/src/main/java/com/oskarsmc/message/command/MessageCommand.java
+++ b/src/main/java/com/oskarsmc/message/command/MessageCommand.java
@@ -1,10 +1,10 @@
 package com.oskarsmc.message.command;
 
-import cloud.commandframework.Command;
-import cloud.commandframework.arguments.standard.StringArgument;
-import cloud.commandframework.minecraft.extras.RichDescription;
-import cloud.commandframework.velocity.VelocityCommandManager;
-import cloud.commandframework.velocity.arguments.PlayerArgument;
+import org.incendo.cloud.Command;
+import org.incendo.cloud.parser.standard.StringParser;
+import org.incendo.cloud.minecraft.extras.RichDescription;
+import org.incendo.cloud.velocity.VelocityCommandManager;
+import org.incendo.cloud.velocity.parser.PlayerParser;
 import com.google.inject.Inject;
 import com.oskarsmc.message.configuration.MessageSettings;
 import com.oskarsmc.message.event.MessageEvent;
@@ -31,14 +31,14 @@ public MessageCommand(@NotNull MessageSettings messageSettings, @NotNull Velocit
         Command.Builder<CommandSource> builder = commandManager.commandBuilder("message", messageSettings.messageAliases().toArray(new String[0]));
 
         commandManager.command(builder
-                .argument(PlayerArgument.of("player"), RichDescription.translatable("oskarsmc.message.command.message.argument.player-argument"))
-                .argument(StringArgument.of("message", StringArgument.StringMode.GREEDY), RichDescription.translatable("oskarsmc.message.command.common.argument.message-description"))
+                .required("player", PlayerParser.playerParser(), RichDescription.translatable("oskarsmc.message.command.message.argument.player-argument"))
+                .required("message", StringParser.greedyStringParser(), RichDescription.translatable("oskarsmc.message.command.common.argument.message-description"))
                 .permission(new DefaultPermission("osmc.message.send"))
                 .handler(context -> {
                     Player receiver = context.get("player");
 
                     proxyServer.getEventManager().fire(new MessageEvent(
-                            context.getSender(),
+                            context.sender(),
                             receiver,
                             context.get("message")
                     )).thenAccept(messageHandler::handleMessageEvent);
diff --git a/src/main/java/com/oskarsmc/message/command/ReplyCommand.java b/src/main/java/com/oskarsmc/message/command/ReplyCommand.java
index 2625a7c..ed02fcc 100644
--- a/src/main/java/com/oskarsmc/message/command/ReplyCommand.java
+++ b/src/main/java/com/oskarsmc/message/command/ReplyCommand.java
@@ -1,9 +1,9 @@
 package com.oskarsmc.message.command;
 
-import cloud.commandframework.Command;
-import cloud.commandframework.arguments.standard.StringArgument;
-import cloud.commandframework.minecraft.extras.RichDescription;
-import cloud.commandframework.velocity.VelocityCommandManager;
+import org.incendo.cloud.Command;
+import org.incendo.cloud.parser.standard.StringParser;
+import org.incendo.cloud.minecraft.extras.RichDescription;
+import org.incendo.cloud.velocity.VelocityCommandManager;
 import com.google.inject.Inject;
 import com.oskarsmc.message.configuration.MessageSettings;
 import com.oskarsmc.message.event.MessageEvent;
@@ -34,14 +34,14 @@ public ReplyCommand(@NotNull MessageSettings messageSettings, @NotNull VelocityC
         commandManager.command(builder
                 .senderType(Player.class)
                 .permission(new DefaultPermission("osmc.message.reply"))
-                .argument(StringArgument.of("message", StringArgument.StringMode.GREEDY), RichDescription.translatable("oskarsmc.message.command.common.argument.message-description"))
+                .required("message", StringParser.greedyStringParser(), RichDescription.translatable("oskarsmc.message.command.common.argument.message-description"))
                 .handler(context -> {
                     Map<Player, Player> conversations = messageHandler.conversations();
 
-                    Player receiver = conversations.get(((Player) context.getSender()));
+                    Player receiver = conversations.get(context.sender());
 
                     proxyServer.getEventManager().fire(new MessageEvent(
-                            context.getSender(),
+                            context.sender(),
                             receiver,
                             context.get("message")
                     )).thenAccept(messageHandler::handleMessageEvent);
diff --git a/src/main/java/com/oskarsmc/message/command/SocialSpyCommand.java b/src/main/java/com/oskarsmc/message/command/SocialSpyCommand.java
index 7f6e37e..b317736 100644
--- a/src/main/java/com/oskarsmc/message/command/SocialSpyCommand.java
+++ b/src/main/java/com/oskarsmc/message/command/SocialSpyCommand.java
@@ -1,7 +1,7 @@
 package com.oskarsmc.message.command;
 
-import cloud.commandframework.Command;
-import cloud.commandframework.velocity.VelocityCommandManager;
+import org.incendo.cloud.Command;
+import org.incendo.cloud.velocity.VelocityCommandManager;
 import com.google.inject.Inject;
 import com.oskarsmc.message.configuration.MessageSettings;
 import com.oskarsmc.message.logic.MessageHandler;
@@ -28,21 +28,21 @@ public SocialSpyCommand(@NotNull MessageSettings messageSettings, @NotNull Veloc
 
         commandManager.command(builder
                 .literal("on")
-                .handler(context -> addWatcher(context.getSender()))
+                .handler(context -> addWatcher(context.sender()))
         );
 
         commandManager.command(builder
                 .literal("off")
-                .handler(context -> removeWatcher(context.getSender()))
+                .handler(context -> removeWatcher(context.sender()))
         );
 
         commandManager.command(builder
                 .literal("toggle")
                 .handler(context -> {
-                    if (messageHandler.conversationWatchers.contains(context.getSender())) {
-                        removeWatcher(context.getSender());
+                    if (messageHandler.conversationWatchers.contains(context.sender())) {
+                        removeWatcher(context.sender());
                     } else {
-                        addWatcher(context.getSender());
+                        addWatcher(context.sender());
                     }
                 })
         );
diff --git a/src/main/java/com/oskarsmc/message/configuration/MessageSettings.java b/src/main/java/com/oskarsmc/message/configuration/MessageSettings.java
index bfa5e8e..3699b98 100644
--- a/src/main/java/com/oskarsmc/message/configuration/MessageSettings.java
+++ b/src/main/java/com/oskarsmc/message/configuration/MessageSettings.java
@@ -102,10 +102,9 @@ public MessageSettings(@DataDirectory @NotNull Path dataFolder, Logger logger) {
 
                 this.customErrorHandlers.put(exceptionClass, entry.getValue().toString());
             } catch (ClassCastException e) {
-                logger.error("Class \"{}\" is not of type exception!", classPath);
-                e.printStackTrace();
+                logger.error("Class \"{}\" is not of type exception!", classPath, e);
             } catch (ClassNotFoundException e) {
-                logger.error("Could not find class \"{}\" as defined in custom exception handlers.", classPath);
+                logger.error("Could not find class \"{}\" as defined in custom exception handlers.", classPath, e);
             }
         }
     }
diff --git a/src/main/java/com/oskarsmc/message/locale/CommandExceptionHandler.java b/src/main/java/com/oskarsmc/message/locale/CommandExceptionHandler.java
index f0798d3..f6d4c3a 100644
--- a/src/main/java/com/oskarsmc/message/locale/CommandExceptionHandler.java
+++ b/src/main/java/com/oskarsmc/message/locale/CommandExceptionHandler.java
@@ -1,6 +1,6 @@
 package com.oskarsmc.message.locale;
 
-import cloud.commandframework.velocity.VelocityCommandManager;
+import org.incendo.cloud.velocity.VelocityCommandManager;
 import com.google.inject.Inject;
 import com.oskarsmc.message.configuration.MessageSettings;
 import com.velocitypowered.api.command.CommandSource;
@@ -25,7 +25,9 @@ public class CommandExceptionHandler {
     public CommandExceptionHandler(@NotNull MessageSettings settings, @NotNull VelocityCommandManager<CommandSource> commandManager, @NotNull Logger logger) {
         MiniMessage miniMessage = MiniMessage.miniMessage();
         for (Map.Entry<Class<? extends Exception>, String> entry : settings.getCustomErrorHandlers().entrySet()) {
-            commandManager.registerExceptionHandler(entry.getKey(), (commandSource, e) -> commandSource.sendMessage(miniMessage.deserialize(entry.getValue())));
+            commandManager.exceptionController().registerHandler(entry.getKey(),
+                context -> context.context()
+                    .sender().sendMessage(miniMessage.deserialize(entry.getValue())));
         }
 
         int exceptionHandlerAmount = settings.getCustomErrorHandlers().size();
diff --git a/src/main/java/com/oskarsmc/message/locale/TranslationManager.java b/src/main/java/com/oskarsmc/message/locale/TranslationManager.java
index d19d341..fe9a799 100644
--- a/src/main/java/com/oskarsmc/message/locale/TranslationManager.java
+++ b/src/main/java/com/oskarsmc/message/locale/TranslationManager.java
@@ -6,7 +6,7 @@
 import com.velocitypowered.api.plugin.annotation.DataDirectory;
 import net.kyori.adventure.key.Key;
 import net.kyori.adventure.translation.GlobalTranslator;
-import net.kyori.adventure.translation.TranslationRegistry;
+import net.kyori.adventure.translation.TranslationStore;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
@@ -23,8 +23,7 @@
  * The translation manager in charge of registering translations.
  */
 public final class TranslationManager {
-    @Inject
-    private Logger logger;
+    private final Logger logger;
 
     /**
      * Construct the translation manager
@@ -36,7 +35,7 @@ public final class TranslationManager {
     public TranslationManager(@NotNull Logger logger, @DataDirectory @NotNull Path dataDirectory) {
         this.logger = logger;
         logger.info("Loading Translations");
-        TranslationRegistry translationRegistry = TranslationRegistry.create(Key.key("oskarsmc", "message"));
+        TranslationStore.StringBased<MessageFormat> translationRegistry = TranslationStore.messageFormat(Key.key("oskarsmc", "message"));
         translationRegistry.defaultLocale(Locale.ENGLISH);
 
         TranslationFile translationFile = readTranslationFile(dataDirectory.resolve("translations/"));
@@ -83,8 +82,7 @@ public TranslationManager(@NotNull Logger logger, @DataDirectory @NotNull Path d
                 return readTranslationFile(translationsDirectory);
             }
         } catch (IOException | JsonParseException exception) {
-            exception.printStackTrace();
-            logger.error("Could not read, parse, or write to {}", relativeCurrentTranslationFile);
+            logger.error("Could not read, parse, or write to {}", relativeCurrentTranslationFile, exception);
             return null;
         }
     }
diff --git a/src/main/java/com/oskarsmc/message/logic/MessageHandler.java b/src/main/java/com/oskarsmc/message/logic/MessageHandler.java
index fb1ba59..b8d8967 100644
--- a/src/main/java/com/oskarsmc/message/logic/MessageHandler.java
+++ b/src/main/java/com/oskarsmc/message/logic/MessageHandler.java
@@ -5,6 +5,7 @@
 import com.velocitypowered.api.command.CommandSource;
 import com.velocitypowered.api.proxy.Player;
 import io.github.miniplaceholders.api.MiniPlaceholders;
+import io.github.miniplaceholders.api.types.RelationalAudience;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
 import net.kyori.adventure.text.minimessage.MiniMessage;
@@ -93,13 +94,15 @@ public void handleMessageEvent(@NotNull MessageEvent event) {
         }
 
         if (messageSettings.miniPlaceholdersIntegration()) {
-            builder.resolver(MiniPlaceholders.getRelationalGlobalPlaceholders(event.sender(), event.recipient()));
+            builder.resolver(MiniPlaceholders.relationalGlobalPlaceholders());
         }
 
         TagResolver placeholders = builder.resolver(event.extraPlaceholders()).build();
 
-        Component senderMessage = miniMessage.deserialize(messageSettings.messageSentMiniMessage(), placeholders);
-        Component receiverMessage = miniMessage.deserialize(messageSettings.messageReceivedMiniMessage(), placeholders);
+        Component senderMessage = miniMessage.deserialize(messageSettings.messageSentMiniMessage(),
+            RelationalAudience.from(event.sender(), event.recipient()), placeholders);
+        Component receiverMessage = miniMessage.deserialize(messageSettings.messageReceivedMiniMessage(),
+            RelationalAudience.from(event.recipient(), event.sender()), placeholders);
 
         event.sender().sendMessage(senderMessage);
         event.recipient().sendMessage(receiverMessage);
diff --git a/src/main/java/com/oskarsmc/message/util/CloudSuggestionProcessor.java b/src/main/java/com/oskarsmc/message/util/CloudSuggestionProcessor.java
index c57886d..2c72d0c 100644
--- a/src/main/java/com/oskarsmc/message/util/CloudSuggestionProcessor.java
+++ b/src/main/java/com/oskarsmc/message/util/CloudSuggestionProcessor.java
@@ -1,37 +1,26 @@
 package com.oskarsmc.message.util;
 
-import cloud.commandframework.execution.CommandSuggestionProcessor;
-import cloud.commandframework.execution.preprocessor.CommandPreprocessingContext;
 import com.velocitypowered.api.command.CommandSource;
 import org.checkerframework.checker.nullness.qual.NonNull;
+import org.incendo.cloud.execution.preprocessor.CommandPreprocessingContext;
+import org.incendo.cloud.suggestion.Suggestion;
+import org.incendo.cloud.suggestion.SuggestionProcessor;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.Locale;
+import java.util.stream.Stream;
 
 /**
  * Lowercase Cloud Suggestion Processor
  */
-public final class CloudSuggestionProcessor implements CommandSuggestionProcessor<CommandSource> {
+public final class CloudSuggestionProcessor implements SuggestionProcessor<CommandSource> {
 
-    @Override
-    public @NonNull List<String> apply(@NonNull CommandPreprocessingContext<CommandSource> context, @NonNull List<String> strings) {
-        String currentInput;
+  @Override
+  public @NonNull Stream<@NonNull Suggestion> process(@NonNull CommandPreprocessingContext<CommandSource> context, @NonNull Stream<@NonNull Suggestion> suggestions) {
+    final String currentInput = context.commandInput().isEmpty()
+        ? ""
+        : context.commandInput().peekString().toLowerCase(Locale.ROOT);
 
-        if (context.getInputQueue().isEmpty()) {
-            currentInput = "";
-        } else {
-            currentInput = context.getInputQueue().peek();
-        }
-
-        currentInput = currentInput.toLowerCase();
-        ArrayList<String> suggestions = new ArrayList<>();
-
-        for (String suggestion : strings) {
-            if (suggestion.toLowerCase().startsWith(currentInput)) {
-                suggestions.add(suggestion);
-            }
-        }
-
-        return suggestions;
-    }
+    return suggestions
+        .filter(suggestion -> suggestion.suggestion().toLowerCase(Locale.ROOT).startsWith(currentInput));
+  }
 }
diff --git a/src/main/java/com/oskarsmc/message/util/DefaultPermission.java b/src/main/java/com/oskarsmc/message/util/DefaultPermission.java
index c529a88..ad9f85d 100644
--- a/src/main/java/com/oskarsmc/message/util/DefaultPermission.java
+++ b/src/main/java/com/oskarsmc/message/util/DefaultPermission.java
@@ -1,16 +1,22 @@
 package com.oskarsmc.message.util;
 
-import cloud.commandframework.permission.PredicatePermission;
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.incendo.cloud.permission.Permission;
+import org.incendo.cloud.permission.PermissionResult;
+import org.incendo.cloud.permission.PredicatePermission;
 import com.velocitypowered.api.command.CommandSource;
 import com.velocitypowered.api.permission.Tristate;
-import org.jetbrains.annotations.NotNull;
 
 /**
  * Default permission PredicatePermission, as it's not present in CLOUD.
  */
-public record DefaultPermission(String permission) implements PredicatePermission<CommandSource> {
-    @Override
-    public boolean hasPermission(@NotNull CommandSource sender) {
-        return sender.getPermissionValue(permission) != Tristate.FALSE;
-    }
+public record DefaultPermission(Permission permission) implements PredicatePermission<CommandSource> {
+  public DefaultPermission(String permission) {
+    this(Permission.of(permission));
+  }
+
+  @Override
+  public @NonNull PermissionResult testPermission(@NonNull CommandSource sender) {
+    return PermissionResult.of(sender.getPermissionValue(permission.permissionString()) != Tristate.FALSE, permission);
+  }
 }
diff --git a/src/main/java/com/oskarsmc/message/util/DependencyChecker.java b/src/main/java/com/oskarsmc/message/util/DependencyChecker.java
index a730efb..4599ff5 100644
--- a/src/main/java/com/oskarsmc/message/util/DependencyChecker.java
+++ b/src/main/java/com/oskarsmc/message/util/DependencyChecker.java
@@ -23,7 +23,7 @@ public static boolean luckperms() {
      */
     public static boolean miniplaceholders() {
         try {
-            Class.forName("io.github.miniplaceholders.api.MiniPlaceholders");
+            Class.forName("io.github.miniplaceholders.api.types.RelationalAudience");
             return true;
         } catch (ClassNotFoundException exception) {
             return false;