diff --git a/.forgejo/workflows/publish-artifact.yml b/.forgejo/workflows/publish-artifact.yml
index b1e3a1c..d10d241 100644
--- a/.forgejo/workflows/publish-artifact.yml
+++ b/.forgejo/workflows/publish-artifact.yml
@@ -7,7 +7,7 @@ jobs:
   build:
     runs-on: docker
     container:
-      image: "git.lab0x13.site/scrow/bazel-java:0.6"
+      image: "git.lab0x13.site/scrow/bazel-java:0.8"
     steps:
       - uses: actions/checkout@v7
       - uses: actions/cache@v6
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 33137a8..0d07d91 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -332,14 +332,6 @@
       </list>
     </recent_temporary>
   </component>
-  <component name="SharedIndexes">
-    <attachedChunks>
-      <set>
-        <option value="bundled-jdk-30f59d01ecdd-63390994e64e-intellij.indexing.shared.core-IU-262.8665.337" />
-        <option value="bundled-js-predefined-d6986cc7102b-4abd2a77f808-JavaScript-IU-262.8665.337" />
-      </set>
-    </attachedChunks>
-  </component>
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
       <changelist id="6414223f-1761-4683-97f5-9dab59d6c44a" name="Changes" comment="" />
diff --git a/bukkit/BUILD b/bukkit/BUILD
index 47dc8a8..8f928ad 100644
--- a/bukkit/BUILD
+++ b/bukkit/BUILD
@@ -2,7 +2,7 @@ load("@rules_jvm_external//:defs.bzl", "artifact", "java_export")
 
 java_export(
     name = "bukkit",
-    maven_coordinates = "de.kentoj.scrow:kencommandapi-bukkit:0.34-SNAPSHOT",
+    maven_coordinates = "de.kentoj.scrow:kencommandapi-bukkit:0.35-SNAPSHOT",
     srcs = glob(["src/main/**/*.java"]),
     deps = [
         "//core",
diff --git a/core/BUILD b/core/BUILD
index 03f0de0..f7860a2 100644
--- a/core/BUILD
+++ b/core/BUILD
@@ -2,7 +2,7 @@ load("@rules_jvm_external//:defs.bzl", "artifact", "java_export")
 
 java_export(
     name = "core",
-    maven_coordinates = "de.kentoj.scrow:kencommandapi-core:0.34-SNAPSHOT",
+    maven_coordinates = "de.kentoj.scrow:kencommandapi-core:0.35-SNAPSHOT",
     srcs = glob(["src/main/**/*.java"]),
     visibility = ["//visibility:public"],
     deps = [
diff --git a/velocity/BUILD b/velocity/BUILD
index ff2e56e..ea0a63f 100644
--- a/velocity/BUILD
+++ b/velocity/BUILD
@@ -2,7 +2,7 @@ load("@rules_jvm_external//:defs.bzl", "artifact", "java_export")
 
 java_export(
     name = "velocity",
-    maven_coordinates = "de.kentoj.scrow:kencommandapi-velocity:0.34-SNAPSHOT",
+    maven_coordinates = "de.kentoj.scrow:kencommandapi-velocity:0.35-SNAPSHOT",
     srcs = glob(["src/main/**/*.java"]),
     deps = [
         "//core",
diff --git a/velocity/src/main/java/de/kentoj/kencommandapi/suggestionprovider/PlayerSuggestionProvider.java b/velocity/src/main/java/de/kentoj/kencommandapi/suggestionprovider/PlayerSuggestionProvider.java
index 16b6473..44fc5f8 100644
--- a/velocity/src/main/java/de/kentoj/kencommandapi/suggestionprovider/PlayerSuggestionProvider.java
+++ b/velocity/src/main/java/de/kentoj/kencommandapi/suggestionprovider/PlayerSuggestionProvider.java
@@ -7,7 +7,7 @@ import de.kentoj.kencommandapi.api.suggestion.SuggestionProvider;
 
 import java.util.List;
 
-public final class PlayerSuggestionProvider implements SuggestionProvider<CommandSource> {
+public final class PlayerSuggestionProvider<T extends CommandSource> implements SuggestionProvider<T> {
 
     private final ProxyServer proxyServer;
 
@@ -16,7 +16,7 @@ public final class PlayerSuggestionProvider implements SuggestionProvider<Comman
     }
 
     @Override
-    public List<String> suggest(CommandSource __) {
+    public List<String> suggest(T __) {
         return proxyServer.getAllPlayers().stream()
                 .map(Player::getUsername)
                 .toList();
diff --git a/velocity/src/main/java/de/kentoj/kencommandapi/type/PlayerArgumentType.java b/velocity/src/main/java/de/kentoj/kencommandapi/type/PlayerArgumentType.java
index a0913f1..d3a8dbb 100644
--- a/velocity/src/main/java/de/kentoj/kencommandapi/type/PlayerArgumentType.java
+++ b/velocity/src/main/java/de/kentoj/kencommandapi/type/PlayerArgumentType.java
@@ -7,7 +7,7 @@ import de.kentoj.kencommandapi.api.argument.ArgumentType;
 import de.kentoj.kencommandapi.api.suggestion.SuggestionProvider;
 import de.kentoj.kencommandapi.suggestionprovider.PlayerSuggestionProvider;
 
-public class PlayerArgumentType implements ArgumentType<CommandSource, Player> {
+public class PlayerArgumentType<T extends CommandSource> implements ArgumentType<T, Player> {
 
     private final ProxyServer server;
 
@@ -23,7 +23,7 @@ public class PlayerArgumentType implements ArgumentType<CommandSource, Player> {
     }
 
     @Override
-    public SuggestionProvider<CommandSource> getDefaultSuggestionProvider() {
-        return new PlayerSuggestionProvider(server);
+    public SuggestionProvider<T> getDefaultSuggestionProvider() {
+        return new PlayerSuggestionProvider<>(server);
     }
 }