diff --git a/build.gradle.kts b/build.gradle.kts
index db5cff7..c5c9470 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -7,7 +7,7 @@ plugins {
 }
 
 group = "de.kentoj.scrow"
-version = "0.2"
+version = "0.4"
 
 fun RepositoryHandler.scrowRepo() = maven {
     name = "scrow"
diff --git a/kencommandapi-bukkit/src/main/java/de/kentoj/kencommandapi/type/OfflinePlayerArgumentType.java b/kencommandapi-bukkit/src/main/java/de/kentoj/kencommandapi/type/OfflinePlayerArgumentType.java
index da88faf..79ba71c 100644
--- a/kencommandapi-bukkit/src/main/java/de/kentoj/kencommandapi/type/OfflinePlayerArgumentType.java
+++ b/kencommandapi-bukkit/src/main/java/de/kentoj/kencommandapi/type/OfflinePlayerArgumentType.java
@@ -4,6 +4,7 @@ import de.kentoj.kencommandapi.BukkitCommandContext;
 import de.kentoj.kencommandapi.api.processing.CommandException;
 import de.kentoj.kencommandapi.api.structure.argument.ArgumentType;
 import de.kentoj.kencommandapi.api.structure.argument.SuggestionProvider;
+import de.kentoj.kencommandapi.api.structure.argument.suggestion.NoSuggestionProvider;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -37,6 +38,6 @@ public class OfflinePlayerArgumentType implements ArgumentType<CommandSender, Bu
 
     @Override
     public SuggestionProvider<CommandSender, BukkitCommandContext> defaultSuggestionProvider() {
-        return context -> Set.of();
+        return new NoSuggestionProvider<>();
     }
 }
diff --git a/kencommandapi-bukkit/src/main/java/de/kentoj/kencommandapi/type/PlayerArgumentType.java b/kencommandapi-bukkit/src/main/java/de/kentoj/kencommandapi/type/PlayerArgumentType.java
index 4fe43f6..884a9b2 100644
--- a/kencommandapi-bukkit/src/main/java/de/kentoj/kencommandapi/type/PlayerArgumentType.java
+++ b/kencommandapi-bukkit/src/main/java/de/kentoj/kencommandapi/type/PlayerArgumentType.java
@@ -4,6 +4,7 @@ import de.kentoj.kencommandapi.BukkitCommandContext;
 import de.kentoj.kencommandapi.api.processing.CommandException;
 import de.kentoj.kencommandapi.api.structure.argument.ArgumentType;
 import de.kentoj.kencommandapi.api.structure.argument.SuggestionProvider;
+import de.kentoj.kencommandapi.api.structure.argument.suggestion.NoSuggestionProvider;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -28,6 +29,6 @@ public class PlayerArgumentType implements ArgumentType<CommandSender, BukkitCom
 
     @Override
     public SuggestionProvider<CommandSender, BukkitCommandContext> defaultSuggestionProvider() {
-        return context -> Set.of();
+        return new NoSuggestionProvider<>();
     }
 }
diff --git a/kencommandapi-core/src/main/java/de/kentoj/kencommandapi/api/structure/argument/SuggestionProvider.java b/kencommandapi-core/src/main/java/de/kentoj/kencommandapi/api/structure/argument/SuggestionProvider.java
index a391ba3..8ad3abc 100644
--- a/kencommandapi-core/src/main/java/de/kentoj/kencommandapi/api/structure/argument/SuggestionProvider.java
+++ b/kencommandapi-core/src/main/java/de/kentoj/kencommandapi/api/structure/argument/SuggestionProvider.java
@@ -3,8 +3,9 @@ package de.kentoj.kencommandapi.api.structure.argument;
 import de.kentoj.kencommandapi.api.processing.CommandContext;
 
 import java.util.Set;
+import java.util.concurrent.CompletableFuture;
 
 public interface SuggestionProvider<T, S extends CommandContext<T, ?>> {
 
-    Set<String> suggest(S context);
+    CompletableFuture<Set<String>> suggest(S context);
 }
diff --git a/kencommandapi-core/src/main/java/de/kentoj/kencommandapi/api/structure/argument/suggestion/NoSuggestionProvider.java b/kencommandapi-core/src/main/java/de/kentoj/kencommandapi/api/structure/argument/suggestion/NoSuggestionProvider.java
index 8c164df..4583ccb 100644
--- a/kencommandapi-core/src/main/java/de/kentoj/kencommandapi/api/structure/argument/suggestion/NoSuggestionProvider.java
+++ b/kencommandapi-core/src/main/java/de/kentoj/kencommandapi/api/structure/argument/suggestion/NoSuggestionProvider.java
@@ -3,12 +3,14 @@ package de.kentoj.kencommandapi.api.structure.argument.suggestion;
 import de.kentoj.kencommandapi.api.processing.CommandContext;
 import de.kentoj.kencommandapi.api.structure.argument.SuggestionProvider;
 
+import java.util.Collections;
 import java.util.Set;
+import java.util.concurrent.CompletableFuture;
 
 public class NoSuggestionProvider<T, S extends CommandContext<T, ?>> implements SuggestionProvider<T, S> {
 
     @Override
-    public Set<String> suggest(S context) {
-        return Set.of();
+    public CompletableFuture<Set<String>> suggest(S ctx) {
+        return CompletableFuture.completedFuture(Collections.emptySet());
     }
 }