diff --git a/bukkit/site/lab0x13/scrow/commands/bukkit/BukkitScrowCommand.java b/bukkit/site/lab0x13/scrow/commands/bukkit/BukkitScrowCommand.java
index 1c8bfe0..8463a61 100644
--- a/bukkit/site/lab0x13/scrow/commands/bukkit/BukkitScrowCommand.java
+++ b/bukkit/site/lab0x13/scrow/commands/bukkit/BukkitScrowCommand.java
@@ -28,7 +28,7 @@ public class BukkitScrowCommand<C extends BukkitCommandContext<C>> extends Comma
     public boolean execute(@NotNull CommandSender commandSender, @NotNull String commandLabel, String @NotNull [] args) {
         commandHandler.invoke(
                 rootLiteral,
-                commandContextFactory.createContext(commandSender),
+                commandContextFactory.createContext(rootLiteral, commandSender),
                 Stream.of(args).filter(str -> !str.isEmpty())
         );
         return true;
diff --git a/bukkit/site/lab0x13/scrow/commands/bukkit/CommandContextFactory.java b/bukkit/site/lab0x13/scrow/commands/bukkit/CommandContextFactory.java
index f254c84..fc3854d 100644
--- a/bukkit/site/lab0x13/scrow/commands/bukkit/CommandContextFactory.java
+++ b/bukkit/site/lab0x13/scrow/commands/bukkit/CommandContextFactory.java
@@ -1,9 +1,10 @@
 package site.lab0x13.scrow.commands.bukkit;
 
 import org.bukkit.command.CommandSender;
+import site.lab0x13.scrow.commands.model.literal.RootLiteral;
 
 @FunctionalInterface
 public interface CommandContextFactory<C extends BukkitCommandContext<C>> {
 
-    C createContext(CommandSender sender);
+    C createContext(RootLiteral<C> literal, CommandSender sender);
 }
diff --git a/bukkit/site/lab0x13/scrow/commands/bukkit/TabCompleteListener.java b/bukkit/site/lab0x13/scrow/commands/bukkit/TabCompleteListener.java
index 0f559eb..60f5328 100644
--- a/bukkit/site/lab0x13/scrow/commands/bukkit/TabCompleteListener.java
+++ b/bukkit/site/lab0x13/scrow/commands/bukkit/TabCompleteListener.java
@@ -38,7 +38,7 @@ public class TabCompleteListener<C extends BukkitCommandContext<C>> implements L
         ev.setHandled(true);
         ev.setCompletions(commandHandler.suggest(
                 literal,
-                commandContextFactory.createContext(ev.getSender()),
+                commandContextFactory.createContext(literal, ev.getSender()),
                 Arrays.copyOfRange(args, 1, args.length),
                 ev.getBuffer().endsWith(" ")
         ));
diff --git a/defs.bzl b/defs.bzl
index 3fc56d5..db3e6e3 100644
--- a/defs.bzl
+++ b/defs.bzl
@@ -1,2 +1,2 @@
 GROUP = "site.lab0x13.scrow"
-VERSION = "1.0.1"
\ No newline at end of file
+VERSION = "1.1.1"
\ No newline at end of file
diff --git a/velocity/site/lab0x13/scrow/commands/velocity/CommandContextFactory.java b/velocity/site/lab0x13/scrow/commands/velocity/CommandContextFactory.java
index 2b9b3d9..4f548eb 100644
--- a/velocity/site/lab0x13/scrow/commands/velocity/CommandContextFactory.java
+++ b/velocity/site/lab0x13/scrow/commands/velocity/CommandContextFactory.java
@@ -1,9 +1,10 @@
 package site.lab0x13.scrow.commands.velocity;
 
 import com.velocitypowered.api.command.CommandSource;
+import site.lab0x13.scrow.commands.model.literal.RootLiteral;
 
 @FunctionalInterface
 public interface CommandContextFactory<C extends VelocityCommandContext<C>> {
 
-    C createContext(CommandSource sender);
+    C createContext(RootLiteral<C> literal, CommandSource sender);
 }
diff --git a/velocity/site/lab0x13/scrow/commands/velocity/VelocityCommand.java b/velocity/site/lab0x13/scrow/commands/velocity/VelocityCommand.java
index 6e93152..7b49149 100644
--- a/velocity/site/lab0x13/scrow/commands/velocity/VelocityCommand.java
+++ b/velocity/site/lab0x13/scrow/commands/velocity/VelocityCommand.java
@@ -23,7 +23,7 @@ public class VelocityCommand<C extends VelocityCommandContext<C>> implements Raw
     public void execute(Invocation invocation) {
         var args = Arrays.stream(invocation.arguments().split(" "))
                 .filter(a -> !a.isEmpty());
-        var ctx = commandContextFactory.createContext(invocation.source());
+        var ctx = commandContextFactory.createContext(rootLiteral, invocation.source());
         commandHandler.invoke(rootLiteral, ctx, args);
     }
 
@@ -36,7 +36,7 @@ public class VelocityCommand<C extends VelocityCommandContext<C>> implements Raw
     @Override
     public List<String> suggest(Invocation invocation) {
         var args = invocation.arguments().split(" ");
-        var ctx = commandContextFactory.createContext(invocation.source());
+        var ctx = commandContextFactory.createContext(rootLiteral, invocation.source());
         return commandHandler.suggest(rootLiteral, ctx, args, invocation.arguments().endsWith(" "));
     }
 }
\ No newline at end of file