diff --git a/eternalcore-api-example/src/main/java/com/eternalcode/example/feature/afk/ApiAfkCommand.java b/eternalcore-api-example/src/main/java/com/eternalcode/example/feature/afk/ApiAfkCommand.java
index e975eb604..fad7fb91d 100644
--- a/eternalcore-api-example/src/main/java/com/eternalcode/example/feature/afk/ApiAfkCommand.java
+++ b/eternalcore-api-example/src/main/java/com/eternalcode/example/feature/afk/ApiAfkCommand.java
@@ -5,14 +5,13 @@
 import com.eternalcode.core.feature.afk.AfkService;
 import dev.rollczi.litecommands.annotations.argument.Arg;
 import dev.rollczi.litecommands.annotations.command.Command;
-import dev.rollczi.litecommands.annotations.context.Context;
+import dev.rollczi.litecommands.annotations.context.Sender;
 import dev.rollczi.litecommands.annotations.execute.Execute;
-import org.bukkit.entity.Player;
-
 import java.time.Instant;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.util.UUID;
+import org.bukkit.entity.Player;
 
 @Command(name = "api afk")
 public class ApiAfkCommand {
@@ -28,14 +27,14 @@ public ApiAfkCommand(AfkService afkService) {
     }
 
     @Execute(name = "isafk")
-    void execute(@Context Player player, @Arg Player target) {
+    void execute(@Sender Player player, @Arg Player target) {
         boolean afk = this.afkService.isAfk(target.getUniqueId());
         String message = "Player %s is %s afk, used via eternalcore api bridge!";
         player.sendMessage(String.format(message, target.getName(), afk ? "now" : "not"));
     }
 
     @Execute(name = "setafk")
-    void executeSetAfk(@Context Player player, @Arg Player target) {
+    void executeSetAfk(@Sender Player player, @Arg Player target) {
         Afk afk = this.afkService.markAfk(target.getUniqueId(), AfkReason.COMMAND);
 
         AfkReason afkReason = afk.getAfkReason();
@@ -53,14 +52,14 @@ void executeSetAfk(@Context Player player, @Arg Player target) {
     }
 
     @Execute(name = "removeafk")
-    void executeRemoveAfk(@Context Player player, @Arg Player target) {
+    void executeRemoveAfk(@Sender Player player, @Arg Player target) {
         this.afkService.clearAfk(target.getUniqueId());
         String message = "You have removed %s from afk via eternalcore api bridge!";
         player.sendMessage(String.format(message, target.getName()));
     }
 
     @Execute(name = "addinteraction")
-    void executeMarkInteraction(@Context Player player, @Arg Player target, @Arg int interactions) {
+    void executeMarkInteraction(@Sender Player player, @Arg Player target, @Arg int interactions) {
         for (int i = 0; i < interactions; i++) {
             this.afkService.markInteraction(target.getUniqueId());
         }
@@ -71,7 +70,7 @@ void executeMarkInteraction(@Context Player player, @Arg Player target, @Arg int
     }
 
     @Execute(name = "demo")
-    void executeDemo(@Context Player player) {
+    void executeDemo(@Sender Player player) {
         player.showDemoScreen();
     }
 
diff --git a/eternalcore-api-example/src/main/java/com/eternalcode/example/feature/home/ApiHomeCommand.java b/eternalcore-api-example/src/main/java/com/eternalcode/example/feature/home/ApiHomeCommand.java
index cd87e28ee..71fcd77c6 100644
--- a/eternalcore-api-example/src/main/java/com/eternalcode/example/feature/home/ApiHomeCommand.java
+++ b/eternalcore-api-example/src/main/java/com/eternalcode/example/feature/home/ApiHomeCommand.java
@@ -3,7 +3,7 @@
 import com.eternalcode.core.feature.home.HomeService;
 import dev.rollczi.litecommands.annotations.argument.Arg;
 import dev.rollczi.litecommands.annotations.command.Command;
-import dev.rollczi.litecommands.annotations.context.Context;
+import dev.rollczi.litecommands.annotations.context.Sender;
 import dev.rollczi.litecommands.annotations.execute.Execute;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
@@ -18,13 +18,13 @@ public ApiHomeCommand(HomeService homeService) {
     }
 
     @Execute(name = "set")
-    void executeSet(@Context Player player, @Arg("homeName") String homeName) {
+    void executeSet(@Sender Player player, @Arg("homeName") String homeName) {
         this.homeService.createHome(player.getUniqueId(), homeName, player.getLocation());
         player.sendMessage("Home set!");
     }
 
     @Execute(name = "teleport")
-    void executeTeleport(@Context Player player, @Arg("homeName") String homeName) {
+    void executeTeleport(@Sender Player player, @Arg("homeName") String homeName) {
         Location location = this.homeService.getHome(player.getUniqueId(), homeName)
             .map(home -> home.getLocation())
             .orElse(null);
@@ -39,13 +39,13 @@ void executeTeleport(@Context Player player, @Arg("homeName") String homeName) {
     }
 
     @Execute(name = "delete")
-    void executeDelete(@Context Player player, @Arg("homeName") String homeName) {
+    void executeDelete(@Sender Player player, @Arg("homeName") String homeName) {
         this.homeService.deleteHome(player.getUniqueId(), homeName);
         player.sendMessage("Home deleted!");
     }
 
     @Execute(name = "list")
-    void executeList(@Context Player player) {
+    void executeList(@Sender Player player) {
         player.sendMessage("Your homes:");
         this.homeService.getHomes(player.getUniqueId())
             .forEach(home -> player.sendMessage(home.getName()));
diff --git a/eternalcore-api-example/src/main/java/com/eternalcode/example/feature/ignore/ApiIgnoreCommand.java b/eternalcore-api-example/src/main/java/com/eternalcode/example/feature/ignore/ApiIgnoreCommand.java
index f56a5a001..88daa7360 100644
--- a/eternalcore-api-example/src/main/java/com/eternalcode/example/feature/ignore/ApiIgnoreCommand.java
+++ b/eternalcore-api-example/src/main/java/com/eternalcode/example/feature/ignore/ApiIgnoreCommand.java
@@ -3,7 +3,7 @@
 import com.eternalcode.core.feature.ignore.IgnoreService;
 import dev.rollczi.litecommands.annotations.argument.Arg;
 import dev.rollczi.litecommands.annotations.command.Command;
-import dev.rollczi.litecommands.annotations.context.Context;
+import dev.rollczi.litecommands.annotations.context.Sender;
 import dev.rollczi.litecommands.annotations.execute.Execute;
 import org.bukkit.entity.Player;
 
@@ -17,27 +17,27 @@ public ApiIgnoreCommand(IgnoreService ignoreService) {
     }
 
     @Execute(name = "ignore")
-    void executeIgnore(@Context Player player, @Arg Player target) {
+    void executeIgnore(@Sender Player player, @Arg Player target) {
         this.ignoreService.ignore(player.getUniqueId(), target.getUniqueId());
         String message = "You have ignored %s via eternalcore api bridge!";
         player.sendMessage(String.format(message, target.getName()));
     }
 
     @Execute(name = "unignore")
-    void executeUnignore(@Context Player player, @Arg Player target) {
+    void executeUnignore(@Sender Player player, @Arg Player target) {
         this.ignoreService.unIgnore(player.getUniqueId(), target.getUniqueId());
         String message = "You have unignored %s via eternalcore api bridge!";
         player.sendMessage(String.format(message, target.getName()));
     }
 
     @Execute(name = "ignoreall")
-    void executeIgnoreAll(@Context Player player) {
+    void executeIgnoreAll(@Sender Player player) {
         this.ignoreService.ignoreAll(player.getUniqueId());
         player.sendMessage("You have ignored all players via eternalcore api bridge!");
     }
 
     @Execute(name = "unignoreall")
-    void executeUnignoreAll(@Context Player player) {
+    void executeUnignoreAll(@Sender Player player) {
         this.ignoreService.unIgnoreAll(player.getUniqueId());
         player.sendMessage("You have unignored all players via eternalcore api bridge!");
     }
diff --git a/eternalcore-api-example/src/main/java/com/eternalcode/example/feature/jail/ApiJailCommand.java b/eternalcore-api-example/src/main/java/com/eternalcode/example/feature/jail/ApiJailCommand.java
index 0bab57b41..dcf0905af 100644
--- a/eternalcore-api-example/src/main/java/com/eternalcode/example/feature/jail/ApiJailCommand.java
+++ b/eternalcore-api-example/src/main/java/com/eternalcode/example/feature/jail/ApiJailCommand.java
@@ -2,7 +2,7 @@
 
 import com.eternalcode.core.feature.jail.JailService;
 import dev.rollczi.litecommands.annotations.command.Command;
-import dev.rollczi.litecommands.annotations.context.Context;
+import dev.rollczi.litecommands.annotations.context.Sender;
 import dev.rollczi.litecommands.annotations.execute.Execute;
 import org.bukkit.entity.Player;
 
@@ -19,7 +19,7 @@ public ApiJailCommand(JailService jailService) {
      * This method allows jailed player to buy freedom for 1 exp.
      */
     @Execute(name = "buy freedom")
-    void executeBuyFreedom(@Context Player player) {
+    void executeBuyFreedom(@Sender Player player) {
         if (!this.jailService.isPlayerJailed(player.getUniqueId())) {
             player.sendMessage("You are not jailed!");
             return;
diff --git a/eternalcore-api-example/src/main/java/com/eternalcode/example/feature/randomteleport/ApiRandomTeleportCommand.java b/eternalcore-api-example/src/main/java/com/eternalcode/example/feature/randomteleport/ApiRandomTeleportCommand.java
index 82e7f5cf9..69ec664e4 100644
--- a/eternalcore-api-example/src/main/java/com/eternalcode/example/feature/randomteleport/ApiRandomTeleportCommand.java
+++ b/eternalcore-api-example/src/main/java/com/eternalcode/example/feature/randomteleport/ApiRandomTeleportCommand.java
@@ -3,7 +3,7 @@
 import com.eternalcode.core.feature.randomteleport.RandomTeleportService;
 import dev.rollczi.litecommands.annotations.argument.Arg;
 import dev.rollczi.litecommands.annotations.command.Command;
-import dev.rollczi.litecommands.annotations.context.Context;
+import dev.rollczi.litecommands.annotations.context.Sender;
 import dev.rollczi.litecommands.annotations.execute.Execute;
 import java.util.concurrent.CompletableFuture;
 import org.bukkit.Location;
@@ -20,7 +20,7 @@ public ApiRandomTeleportCommand(RandomTeleportService randomTeleportService) {
     }
 
     @Execute(name = "safe-random-location")
-    void execute(@Context Player player, @Arg int attempts) {
+    void execute(@Sender Player player, @Arg int attempts) {
         World world = player.getWorld();
 
         CompletableFuture<Location> safeRandomLocation =
@@ -30,7 +30,7 @@ void execute(@Context Player player, @Arg int attempts) {
     }
 
     @Execute(name = "safe-random-location-with-radius")
-    void execute(@Context Player player, @Arg int radius, @Arg int attempts) {
+    void execute(@Sender Player player, @Arg int radius, @Arg int attempts) {
         World world = player.getWorld();
 
         CompletableFuture<Location> safeRandomLocation =
@@ -40,12 +40,12 @@ void execute(@Context Player player, @Arg int radius, @Arg int attempts) {
     }
 
     @Execute(name = "teleport")
-    void execute(@Context Player player, @Arg Player target) {
+    void execute(@Sender Player player, @Arg Player target) {
         this.randomTeleportService.teleport(target);
     }
 
     @Execute(name = "teleport")
-    void execute(@Context Player player, @Arg Player target, @Arg World world) {
+    void execute(@Sender Player player, @Arg Player target, @Arg World world) {
         this.randomTeleportService.teleport(target, world);
     }
 }
diff --git a/eternalcore-api-example/src/main/java/com/eternalcode/example/feature/spawn/ApiSpawnCommand.java b/eternalcore-api-example/src/main/java/com/eternalcode/example/feature/spawn/ApiSpawnCommand.java
index 946f430ba..04542120b 100644
--- a/eternalcore-api-example/src/main/java/com/eternalcode/example/feature/spawn/ApiSpawnCommand.java
+++ b/eternalcore-api-example/src/main/java/com/eternalcode/example/feature/spawn/ApiSpawnCommand.java
@@ -3,7 +3,7 @@
 import com.eternalcode.core.feature.spawn.SpawnService;
 import dev.rollczi.litecommands.annotations.argument.Arg;
 import dev.rollczi.litecommands.annotations.command.Command;
-import dev.rollczi.litecommands.annotations.context.Context;
+import dev.rollczi.litecommands.annotations.context.Sender;
 import dev.rollczi.litecommands.annotations.execute.Execute;
 import org.bukkit.entity.Player;
 
@@ -17,20 +17,20 @@ public ApiSpawnCommand(SpawnService spawnService) {
     }
 
     @Execute(name = "set")
-    void execute(@Context Player player) {
+    void execute(@Sender Player player) {
         this.spawnService.setSpawnLocation(player.getLocation());
         player.sendMessage("You have set the spawn location via EternalCore developer api bridge, congratulations!");
     }
 
     @Execute(name = "teleport")
-    void executeTeleport(@Context Player player, @Arg Player target) {
+    void executeTeleport(@Sender Player player, @Arg Player target) {
         this.spawnService.teleportToSpawn(target);
         String message = "You have teleported %s to the spawn location via EternalCore developer api bridge, congratulations!";
         player.sendMessage(String.format(message, target.getName()));
     }
 
     @Execute(name = "spawnlocation")
-    void executeSpawnLocation(@Context Player player) {
+    void executeSpawnLocation(@Sender Player player) {
         player.sendMessage("The spawn location is set at: " + this.spawnService.getSpawnLocation());
     }
 }
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/EternalCoreCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/EternalCoreCommand.java
index 98fb31bbe..d17c23e16 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/EternalCoreCommand.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/EternalCoreCommand.java
@@ -1,24 +1,21 @@
 package com.eternalcode.core;
 
 import com.eternalcode.annotations.scan.command.DescriptionDocs;
-import com.eternalcode.commons.scheduler.Scheduler;
 import com.eternalcode.core.configuration.ConfigurationManager;
 import com.eternalcode.core.injector.annotations.Inject;
 import com.eternalcode.core.publish.Publisher;
 import com.eternalcode.core.publish.event.EternalReloadEvent;
 import com.google.common.base.Stopwatch;
 import dev.rollczi.litecommands.annotations.async.Async;
-import dev.rollczi.litecommands.annotations.context.Context;
+import dev.rollczi.litecommands.annotations.command.Command;
+import dev.rollczi.litecommands.annotations.context.Sender;
 import dev.rollczi.litecommands.annotations.execute.Execute;
 import dev.rollczi.litecommands.annotations.permission.Permission;
-import dev.rollczi.litecommands.annotations.command.Command;
+import java.util.concurrent.TimeUnit;
 import net.kyori.adventure.audience.Audience;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.MiniMessage;
 
-import java.time.Duration;
-import java.util.concurrent.TimeUnit;
-
 @Command(name = "eternalcore")
 @Permission("eternalcore.eternalcore")
 class EternalCoreCommand {
@@ -39,7 +36,7 @@ class EternalCoreCommand {
     @Async
     @Execute(name = "reload")
     @DescriptionDocs(description = "Reloads EternalCore configuration")
-    void reload(@Context Audience audience) {
+    void reload(@Sender Audience audience) {
         long millis = this.reload();
         Component message = this.miniMessage.deserialize(RELOAD_MESSAGE.formatted(millis));
 
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/afk/AfkCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/afk/AfkCommand.java
index 3edc5ead3..d37aa2270 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/afk/AfkCommand.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/afk/AfkCommand.java
@@ -9,7 +9,7 @@
 import com.eternalcode.core.notice.NoticeService;
 import com.eternalcode.core.util.DurationUtil;
 import dev.rollczi.litecommands.annotations.command.Command;
-import dev.rollczi.litecommands.annotations.context.Context;
+import dev.rollczi.litecommands.annotations.context.Sender;
 import dev.rollczi.litecommands.annotations.execute.Execute;
 import dev.rollczi.litecommands.annotations.permission.Permission;
 import java.time.Duration;
@@ -42,7 +42,7 @@ class AfkCommand {
 
     @Execute
     @DescriptionDocs(description = "Toggles AFK status for the player.")
-    void execute(@Context Player player) {
+    void execute(@Sender Player player) {
         UUID uuid = player.getUniqueId();
 
         if (player.hasPermission(AFK_BYPASS_PERMISSION)) {
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/automessage/AutoMessageCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/automessage/AutoMessageCommand.java
index 77eed317f..3216392d8 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/automessage/AutoMessageCommand.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/automessage/AutoMessageCommand.java
@@ -4,7 +4,7 @@
 import com.eternalcode.core.injector.annotations.Inject;
 import com.eternalcode.core.notice.NoticeService;
 import dev.rollczi.litecommands.annotations.command.Command;
-import dev.rollczi.litecommands.annotations.context.Context;
+import dev.rollczi.litecommands.annotations.context.Sender;
 import dev.rollczi.litecommands.annotations.execute.Execute;
 import dev.rollczi.litecommands.annotations.permission.Permission;
 import org.bukkit.entity.Player;
@@ -24,7 +24,7 @@ class AutoMessageCommand {
 
     @Execute
     @DescriptionDocs(description = "Toggles the display of automatic messages.")
-    void execute(@Context Player player) {
+    void execute(@Sender Player player) {
         this.autoMessageService.switchReceiving(player.getUniqueId()).thenAccept(receiving -> {
             if (receiving) {
                 this.noticeService.player(player.getUniqueId(), messages -> messages.autoMessage().enabled());
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/burn/BurnCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/burn/BurnCommand.java
index c6da1b750..b6deb2580 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/burn/BurnCommand.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/burn/BurnCommand.java
@@ -5,12 +5,11 @@
 import com.eternalcode.core.notice.NoticeService;
 import dev.rollczi.litecommands.annotations.argument.Arg;
 import dev.rollczi.litecommands.annotations.command.Command;
-import dev.rollczi.litecommands.annotations.context.Context;
+import dev.rollczi.litecommands.annotations.context.Sender;
 import dev.rollczi.litecommands.annotations.execute.Execute;
 import dev.rollczi.litecommands.annotations.permission.Permission;
-import org.bukkit.entity.Player;
-
 import java.util.Optional;
+import org.bukkit.entity.Player;
 
 @Command(name = "burn", aliases = {"ignite"})
 @Permission("eternalcore.burn")
@@ -26,14 +25,14 @@ public BurnCommand(NoticeService noticeService) {
 
     @Execute
     @DescriptionDocs(description = "Burns yourself for a specified amount of ticks.", arguments = "[ticks]")
-    void self(@Context Player sender, @Arg Optional<Integer> ticks) {
+    void self(@Sender Player sender, @Arg Optional<Integer> ticks) {
         this.burn(sender, sender, ticks);
     }
 
     @Execute
     @Permission("eternalcore.burn.other")
     @DescriptionDocs(description = "Burns target for a specified amount of ticks.", arguments = "<target> [ticks]")
-    void other(@Context Player sender, @Arg Player target, @Arg Optional<Integer> ticks) {
+    void other(@Sender Player sender, @Arg Player target, @Arg Optional<Integer> ticks) {
         this.burn(sender, target, ticks);
     }
 
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/butcher/ButcherCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/butcher/ButcherCommand.java
index 997837031..7d653d62d 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/butcher/ButcherCommand.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/butcher/ButcherCommand.java
@@ -6,19 +6,18 @@
 import com.eternalcode.core.notice.NoticeService;
 import dev.rollczi.litecommands.annotations.argument.Arg;
 import dev.rollczi.litecommands.annotations.command.Command;
-import dev.rollczi.litecommands.annotations.context.Context;
+import dev.rollczi.litecommands.annotations.context.Sender;
 import dev.rollczi.litecommands.annotations.execute.Execute;
 import dev.rollczi.litecommands.annotations.permission.Permission;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
 import org.bukkit.Chunk;
 import org.bukkit.Location;
 import org.bukkit.World;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
 @SuppressWarnings("SameParameterValue")
 @Command(name = "butcher", aliases = { "killmob" })
 @Permission("eternalcore.butcher")
@@ -35,19 +34,19 @@ class ButcherCommand {
 
     @Execute
     @DescriptionDocs(description = "Kills all mobs in 2 chunks around you")
-    void execute(@Context Player player) {
+    void execute(@Sender Player player) {
         this.execute(player, 2);
     }
 
     @Execute
     @DescriptionDocs(description = "Kills all mobs in specified chunks around you", arguments = "<chunks>")
-    void execute(@Context Player player, @Arg(ButcherArgument.KEY) int chunks) {
+    void execute(@Sender Player player, @Arg(ButcherArgument.KEY) int chunks) {
         this.execute(player, chunks, new MobEntity(MobType.ALL));
     }
 
     @Execute
     @DescriptionDocs(description = "Kills specified mob in specified chunks around you", arguments = "<chunks> <mobType>")
-    void execute(@Context Player player, @Arg(ButcherArgument.KEY) int chunks, @Arg(MobEntityArgument.KEY) MobEntity mobEntity) {
+    void execute(@Sender Player player, @Arg(ButcherArgument.KEY) int chunks, @Arg(MobEntityArgument.KEY) MobEntity mobEntity) {
         this.killMobs(player, chunks, mobEntity::isMatch);
     }
 
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/chat/ChatCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/chat/ChatCommand.java
index c46985f1e..b0c282786 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/chat/ChatCommand.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/chat/ChatCommand.java
@@ -15,7 +15,7 @@
 import com.eternalcode.core.viewer.Viewer;
 import dev.rollczi.litecommands.annotations.argument.Arg;
 import dev.rollczi.litecommands.annotations.command.Command;
-import dev.rollczi.litecommands.annotations.context.Context;
+import dev.rollczi.litecommands.annotations.context.Sender;
 import dev.rollczi.litecommands.annotations.execute.Execute;
 import dev.rollczi.litecommands.annotations.permission.Permission;
 import java.time.Duration;
@@ -57,7 +57,7 @@ class ChatCommand {
 
     @Execute(name = "clear", aliases = "cc")
     @DescriptionDocs(description = "Clears chat")
-    void clear(@Context CommandSender sender) {
+    void clear(@Sender CommandSender sender) {
         ClearChatEvent event = this.eventCaller.callEvent(new ClearChatEvent(sender));
 
         if (event.isCancelled()) {
@@ -79,7 +79,7 @@ void clear(@Context CommandSender sender) {
 
     @Execute(name = "on")
     @DescriptionDocs(description = "Enables chat")
-    void enable(@Context Viewer viewer, @Context CommandSender sender) {
+    void enable(@Sender Viewer viewer, @Sender CommandSender sender) {
         if (this.chatSettings.chatEnabled()) {
             this.noticeService.viewer(viewer, translation -> translation.chat().alreadyEnabled());
             return;
@@ -102,7 +102,7 @@ void enable(@Context Viewer viewer, @Context CommandSender sender) {
 
     @Execute(name = "off")
     @DescriptionDocs(description = "Disables chat")
-    void disable(@Context Viewer viewer, @Context CommandSender sender) {
+    void disable(@Sender Viewer viewer, @Sender CommandSender sender) {
         if (!this.chatSettings.chatEnabled()) {
             this.noticeService.viewer(viewer, translation -> translation.chat().alreadyDisabled());
             return;
@@ -125,7 +125,7 @@ void disable(@Context Viewer viewer, @Context CommandSender sender) {
 
     @Execute(name = "slowmode")
     @DescriptionDocs(description = "Sets slowmode for chat", arguments = "<time>")
-    void slowmode(@Context Viewer viewer, @Arg Duration duration) {
+    void slowmode(@Sender Viewer viewer, @Arg Duration duration) {
         if (duration.isNegative()) {
             this.noticeService.viewer(viewer, translation -> translation.argument().numberBiggerThanOrEqualZero());
             return;
@@ -161,7 +161,7 @@ void slowmode(@Context Viewer viewer, @Arg Duration duration) {
 
     @Execute(name = "slowmode 0")
     @DescriptionDocs(description = "Disable SlowMode for chat")
-    void slowmodeOff(@Context Viewer viewer) {
+    void slowmodeOff(@Sender Viewer viewer) {
         Duration noSlowMode = Duration.ZERO;
         this.slowmode(viewer, noSlowMode);
     }
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/clear/InventoryClearCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/clear/InventoryClearCommand.java
index 826c45176..66061dfef 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/clear/InventoryClearCommand.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/clear/InventoryClearCommand.java
@@ -6,7 +6,7 @@
 import com.eternalcode.core.viewer.Viewer;
 import dev.rollczi.litecommands.annotations.argument.Arg;
 import dev.rollczi.litecommands.annotations.command.Command;
-import dev.rollczi.litecommands.annotations.context.Context;
+import dev.rollczi.litecommands.annotations.context.Sender;
 import dev.rollczi.litecommands.annotations.execute.Execute;
 import dev.rollczi.litecommands.annotations.permission.Permission;
 import org.bukkit.entity.Player;
@@ -25,14 +25,14 @@ class InventoryClearCommand {
 
     @Execute
     @DescriptionDocs(description = "Clears your inventory")
-    void execute(@Context Player player) {
+    void execute(@Sender Player player) {
         this.clear(player);
     }
 
     @Execute
     @DescriptionDocs(description = "Clears inventory of player", arguments = "<player>")
     @Permission("eternalcore.clear.other")
-    void execute(@Context Viewer audience, @Arg Player target) {
+    void execute(@Sender Viewer audience, @Arg Player target) {
         this.clear(target);
 
         this.noticeService.create()
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/container/AnvilCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/container/AnvilCommand.java
index 5b7acec9d..f7bef3e37 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/container/AnvilCommand.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/container/AnvilCommand.java
@@ -6,7 +6,7 @@
 import com.eternalcode.paper.PaperContainer;
 import dev.rollczi.litecommands.annotations.argument.Arg;
 import dev.rollczi.litecommands.annotations.command.Command;
-import dev.rollczi.litecommands.annotations.context.Context;
+import dev.rollczi.litecommands.annotations.context.Sender;
 import dev.rollczi.litecommands.annotations.execute.Execute;
 import dev.rollczi.litecommands.annotations.permission.Permission;
 import org.bukkit.command.CommandSender;
@@ -25,14 +25,14 @@ class AnvilCommand {
     @Execute
     @Permission("eternalcore.anvil")
     @DescriptionDocs(description = "Opens an anvil for you")
-    void executeSelf(@Context Player player) {
+    void executeSelf(@Sender Player player) {
         this.openAnvil(player);
     }
 
     @Execute
     @Permission("eternalcore.anvil.other")
     @DescriptionDocs(description = "Opens an anvil for another player", arguments = "<player>")
-    void execute(@Context CommandSender sender, @Arg Player target) {
+    void execute(@Sender CommandSender sender, @Arg Player target) {
         this.openAnvil(target);
 
         this.noticeService.create()
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/container/CartographyTableCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/container/CartographyTableCommand.java
index 9e10556db..dafb067d6 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/container/CartographyTableCommand.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/container/CartographyTableCommand.java
@@ -1,13 +1,12 @@
 package com.eternalcode.core.feature.container;
 
-
 import com.eternalcode.annotations.scan.command.DescriptionDocs;
 import com.eternalcode.core.injector.annotations.Inject;
 import com.eternalcode.core.notice.NoticeService;
 import com.eternalcode.paper.PaperContainer;
 import dev.rollczi.litecommands.annotations.argument.Arg;
 import dev.rollczi.litecommands.annotations.command.Command;
-import dev.rollczi.litecommands.annotations.context.Context;
+import dev.rollczi.litecommands.annotations.context.Sender;
 import dev.rollczi.litecommands.annotations.execute.Execute;
 import dev.rollczi.litecommands.annotations.permission.Permission;
 import org.bukkit.command.CommandSender;
@@ -26,14 +25,14 @@ class CartographyTableCommand {
     @Execute
     @Permission("eternalcore.cartography")
     @DescriptionDocs(description = "Opens a cartography table for you")
-    void executeSelf(@Context Player player) {
+    void executeSelf(@Sender Player player) {
         this.openCartographyTable(player);
     }
 
     @Execute
     @Permission("eternalcore.cartography.other")
     @DescriptionDocs(description = "Opens a cartography table for another player", arguments = "<player>")
-    void execute(@Context CommandSender sender, @Arg Player target) {
+    void execute(@Sender CommandSender sender, @Arg Player target) {
         this.openCartographyTable(target);
 
         this.noticeService.create()
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/container/DisposalCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/container/DisposalCommand.java
index 49f26a2de..f4d6f5bff 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/container/DisposalCommand.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/container/DisposalCommand.java
@@ -1,16 +1,16 @@
 package com.eternalcode.core.feature.container;
 
 import com.eternalcode.annotations.scan.command.DescriptionDocs;
+import com.eternalcode.commons.adventure.AdventureUtil;
 import com.eternalcode.core.injector.annotations.Inject;
 import com.eternalcode.core.notice.NoticeService;
 import com.eternalcode.core.translation.Translation;
 import com.eternalcode.core.translation.TranslationManager;
-import com.eternalcode.commons.adventure.AdventureUtil;
 import dev.rollczi.litecommands.annotations.argument.Arg;
-import dev.rollczi.litecommands.annotations.context.Context;
+import dev.rollczi.litecommands.annotations.command.Command;
+import dev.rollczi.litecommands.annotations.context.Sender;
 import dev.rollczi.litecommands.annotations.execute.Execute;
 import dev.rollczi.litecommands.annotations.permission.Permission;
-import dev.rollczi.litecommands.annotations.command.Command;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.MiniMessage;
 import org.bukkit.Server;
@@ -36,14 +36,14 @@ class DisposalCommand {
 
     @Execute
     @DescriptionDocs(description = "Opens a disposal")
-    void execute(@Context Player player) {
+    void execute(@Sender Player player) {
         this.openDisposal(player);
     }
 
     @Execute
     @DescriptionDocs(description = "Opens a disposal for target")
     @Permission("eternalcore.disposal.other")
-    void executeOther(@Context CommandSender commandSender, @Arg Player target) {
+    void executeOther(@Sender CommandSender commandSender, @Arg Player target) {
         this.openDisposal(target);
 
         this.noticeService.create()
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/container/EnderchestCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/container/EnderchestCommand.java
index f39ae8126..fa8b72a74 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/container/EnderchestCommand.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/container/EnderchestCommand.java
@@ -1,14 +1,13 @@
 package com.eternalcode.core.feature.container;
 
-
 import com.eternalcode.annotations.scan.command.DescriptionDocs;
 import com.eternalcode.core.injector.annotations.Inject;
 import com.eternalcode.core.notice.NoticeService;
 import dev.rollczi.litecommands.annotations.argument.Arg;
-import dev.rollczi.litecommands.annotations.context.Context;
+import dev.rollczi.litecommands.annotations.command.Command;
+import dev.rollczi.litecommands.annotations.context.Sender;
 import dev.rollczi.litecommands.annotations.execute.Execute;
 import dev.rollczi.litecommands.annotations.permission.Permission;
-import dev.rollczi.litecommands.annotations.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
@@ -25,14 +24,14 @@ class EnderchestCommand {
     @Execute
     @Permission("eternalcore.enderchest")
     @DescriptionDocs(description = "Opens your enderchest")
-    void execute(@Context Player player) {
+    void execute(@Sender Player player) {
         this.openEnderChest(player);
     }
 
     @Execute
     @Permission("eternalcore.enderchest.other")
     @DescriptionDocs(description = "Opens selected player's enderchest to him", arguments = "<player>")
-    void execute(@Context CommandSender commandSender, @Arg Player target) {
+    void execute(@Sender CommandSender commandSender, @Arg Player target) {
         this.openEnderChest(target);
 
         this.noticeService.create()
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/container/GrindstoneCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/container/GrindstoneCommand.java
index d5f09a4bc..91bcb47cf 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/container/GrindstoneCommand.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/container/GrindstoneCommand.java
@@ -1,13 +1,12 @@
 package com.eternalcode.core.feature.container;
 
-
 import com.eternalcode.annotations.scan.command.DescriptionDocs;
 import com.eternalcode.core.injector.annotations.Inject;
 import com.eternalcode.core.notice.NoticeService;
 import com.eternalcode.paper.PaperContainer;
 import dev.rollczi.litecommands.annotations.argument.Arg;
 import dev.rollczi.litecommands.annotations.command.Command;
-import dev.rollczi.litecommands.annotations.context.Context;
+import dev.rollczi.litecommands.annotations.context.Sender;
 import dev.rollczi.litecommands.annotations.execute.Execute;
 import dev.rollczi.litecommands.annotations.permission.Permission;
 import org.bukkit.command.CommandSender;
@@ -26,14 +25,14 @@ class GrindstoneCommand {
     @Execute
     @Permission("eternalcore.grindstone")
     @DescriptionDocs(description = "Opens a grindstone for you")
-    void executeSelf(@Context Player player) {
+    void executeSelf(@Sender Player player) {
         this.openGrindstone(player);
     }
 
     @Execute
     @Permission("eternalcore.grindstone.other")
     @DescriptionDocs(description = "Opens a grindstone for another player", arguments = "<player>")
-    void execute(@Context CommandSender commandSender, @Arg Player target) {
+    void execute(@Sender CommandSender commandSender, @Arg Player target) {
         this.openGrindstone(target);
 
         this.announcer.create()
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/container/LoomCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/container/LoomCommand.java
index cd7eb8b4d..cd376cd67 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/container/LoomCommand.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/container/LoomCommand.java
@@ -6,7 +6,7 @@
 import com.eternalcode.paper.PaperContainer;
 import dev.rollczi.litecommands.annotations.argument.Arg;
 import dev.rollczi.litecommands.annotations.command.Command;
-import dev.rollczi.litecommands.annotations.context.Context;
+import dev.rollczi.litecommands.annotations.context.Sender;
 import dev.rollczi.litecommands.annotations.execute.Execute;
 import dev.rollczi.litecommands.annotations.permission.Permission;
 import org.bukkit.command.CommandSender;
@@ -25,14 +25,14 @@ class LoomCommand {
     @Execute
     @Permission("eternalcore.loom")
     @DescriptionDocs(description = "Opens a loom for you")
-    void executeSelf(@Context Player player) {
+    void executeSelf(@Sender Player player) {
         this.openLoom(player);
     }
 
     @Execute
     @Permission("eternalcore.loom.other")
     @DescriptionDocs(description = "Opens a loom for another player", arguments = "<player>")
-    void execute(@Context CommandSender commandSender, @Arg Player target) {
+    void execute(@Sender CommandSender commandSender, @Arg Player target) {
         this.openLoom(target);
 
         this.noticeService.create()
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/container/SmithingTableCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/container/SmithingTableCommand.java
index 3f8e38120..79b50dddc 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/container/SmithingTableCommand.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/container/SmithingTableCommand.java
@@ -6,7 +6,7 @@
 import com.eternalcode.paper.PaperContainer;
 import dev.rollczi.litecommands.annotations.argument.Arg;
 import dev.rollczi.litecommands.annotations.command.Command;
-import dev.rollczi.litecommands.annotations.context.Context;
+import dev.rollczi.litecommands.annotations.context.Sender;
 import dev.rollczi.litecommands.annotations.execute.Execute;
 import dev.rollczi.litecommands.annotations.permission.Permission;
 import org.bukkit.command.CommandSender;
@@ -25,14 +25,14 @@ class SmithingTableCommand {
     @Execute
     @Permission("eternalcore.smithingtable")
     @DescriptionDocs(description = "Opens a smithing table for you")
-    void executeSelf(@Context Player player) {
+    void executeSelf(@Sender Player player) {
         this.openSmithingTable(player);
     }
 
     @Execute
     @Permission("eternalcore.smithingtable.other")
     @DescriptionDocs(description = "Opens a smithing table for another player", arguments = "<player>")
-    void execute(@Context CommandSender commandSender, @Arg Player target) {
+    void execute(@Sender CommandSender commandSender, @Arg Player target) {
         this.openSmithingTable(target);
 
         this.noticeService.create()
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/container/StonecutterCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/container/StonecutterCommand.java
index 915e66a5e..cdad204ec 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/container/StonecutterCommand.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/container/StonecutterCommand.java
@@ -1,13 +1,12 @@
 package com.eternalcode.core.feature.container;
 
-
 import com.eternalcode.annotations.scan.command.DescriptionDocs;
 import com.eternalcode.core.injector.annotations.Inject;
 import com.eternalcode.core.notice.NoticeService;
 import com.eternalcode.paper.PaperContainer;
 import dev.rollczi.litecommands.annotations.argument.Arg;
 import dev.rollczi.litecommands.annotations.command.Command;
-import dev.rollczi.litecommands.annotations.context.Context;
+import dev.rollczi.litecommands.annotations.context.Sender;
 import dev.rollczi.litecommands.annotations.execute.Execute;
 import dev.rollczi.litecommands.annotations.permission.Permission;
 import org.bukkit.command.CommandSender;
@@ -26,14 +25,14 @@ class StonecutterCommand {
     @Execute
     @Permission("eternalcore.stonecutter")
     @DescriptionDocs(description = "Opens a stonecutter for you")
-    void executeSelf(@Context Player player) {
+    void executeSelf(@Sender Player player) {
         this.openStonecutter(player);
     }
 
     @Execute
     @Permission("eternalcore.stonecutter.other")
     @DescriptionDocs(description = "Opens a stonecutter for another player", arguments = "<player>")
-    void execute(@Context CommandSender commandSender, @Arg Player target) {
+    void execute(@Sender CommandSender commandSender, @Arg Player target) {
         this.openStonecutter(target);
 
         this.noticeService.create()
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/container/WorkbenchCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/container/WorkbenchCommand.java
index 8e7ff659f..b4a29784b 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/container/WorkbenchCommand.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/container/WorkbenchCommand.java
@@ -1,14 +1,13 @@
 package com.eternalcode.core.feature.container;
 
-
 import com.eternalcode.annotations.scan.command.DescriptionDocs;
 import com.eternalcode.core.injector.annotations.Inject;
 import com.eternalcode.core.notice.NoticeService;
 import dev.rollczi.litecommands.annotations.argument.Arg;
-import dev.rollczi.litecommands.annotations.context.Context;
+import dev.rollczi.litecommands.annotations.command.Command;
+import dev.rollczi.litecommands.annotations.context.Sender;
 import dev.rollczi.litecommands.annotations.execute.Execute;
 import dev.rollczi.litecommands.annotations.permission.Permission;
-import dev.rollczi.litecommands.annotations.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
@@ -25,14 +24,14 @@ class WorkbenchCommand {
     @Execute
     @Permission("eternalcore.workbench")
     @DescriptionDocs(description = "Opens a workbench for you")
-    void executeSelf(@Context Player player) {
+    void executeSelf(@Sender Player player) {
         this.openWorkbench(player);
     }
 
     @Execute
     @Permission("eternalcore.workbench.other")
     @DescriptionDocs(description = "Opens a workbench for another player", arguments = "<player>")
-    void execute(@Context CommandSender commandSender, @Arg Player target) {
+    void execute(@Sender CommandSender commandSender, @Arg Player target) {
         this.openWorkbench(target);
 
         this.noticeService.create()
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/enchant/EnchantCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/enchant/EnchantCommand.java
index 37349e162..13603f99c 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/enchant/EnchantCommand.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/enchant/EnchantCommand.java
@@ -5,17 +5,16 @@
 import com.eternalcode.core.injector.annotations.Inject;
 import com.eternalcode.core.notice.NoticeService;
 import dev.rollczi.litecommands.annotations.argument.Arg;
-import dev.rollczi.litecommands.annotations.context.Context;
+import dev.rollczi.litecommands.annotations.command.Command;
+import dev.rollczi.litecommands.annotations.context.Sender;
 import dev.rollczi.litecommands.annotations.execute.Execute;
 import dev.rollczi.litecommands.annotations.permission.Permission;
-import dev.rollczi.litecommands.annotations.command.Command;
+import java.util.UUID;
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.PlayerInventory;
 
-import java.util.UUID;
-
 @Command(name = "enchant")
 @Permission("eternalcore.enchant")
 class EnchantCommand {
@@ -31,7 +30,7 @@ class EnchantCommand {
 
     @Execute
     @DescriptionDocs(description = "Enchants item in hand", arguments = "<enchantment> <level>")
-    void execute(@Context Player player, @Arg Enchantment enchantment, @Arg(EnchantArgument.KEY) int level) {
+    void execute(@Sender Player player, @Arg Enchantment enchantment, @Arg(EnchantArgument.KEY) int level) {
         PlayerInventory playerInventory = player.getInventory();
         ItemStack handItem = playerInventory.getItem(playerInventory.getHeldItemSlot());
 
@@ -54,7 +53,7 @@ void execute(@Context Player player, @Arg Enchantment enchantment, @Arg(EnchantA
 
     @Execute
     @DescriptionDocs(description = "Enchants item in hand", arguments = "<enchantment> <level> <player>")
-    void execute(@Context Player sender, @Arg Enchantment enchantment, @Arg(EnchantArgument.KEY) int level, @Arg Player target) {
+    void execute(@Sender Player sender, @Arg Enchantment enchantment, @Arg(EnchantArgument.KEY) int level, @Arg Player target) {
         PlayerInventory targetInventory = target.getInventory();
         ItemStack handItem = targetInventory.getItem(targetInventory.getHeldItemSlot());
 
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/feed/FeedCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/feed/FeedCommand.java
index 0caadb270..858a9722d 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/feed/FeedCommand.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/feed/FeedCommand.java
@@ -5,10 +5,10 @@
 import com.eternalcode.core.notice.NoticeService;
 import com.eternalcode.core.viewer.Viewer;
 import dev.rollczi.litecommands.annotations.argument.Arg;
-import dev.rollczi.litecommands.annotations.context.Context;
+import dev.rollczi.litecommands.annotations.command.Command;
+import dev.rollczi.litecommands.annotations.context.Sender;
 import dev.rollczi.litecommands.annotations.execute.Execute;
 import dev.rollczi.litecommands.annotations.permission.Permission;
-import dev.rollczi.litecommands.annotations.command.Command;
 import org.bukkit.entity.Player;
 
 @Command(name = "feed")
@@ -24,7 +24,7 @@ class FeedCommand {
     @Execute
     @Permission("eternalcore.feed")
     @DescriptionDocs(description = "Feed yourself")
-    void execute(@Context Player player) {
+    void execute(@Sender Player player) {
         this.feed(player);
 
         this.noticeService.create()
@@ -36,7 +36,7 @@ void execute(@Context Player player) {
     @Execute
     @Permission("eternalcore.feed.other")
     @DescriptionDocs(description = "Feed other player", arguments = "<player>")
-    void execute(@Context Viewer viewer, @Arg Player target) {
+    void execute(@Sender Viewer viewer, @Arg Player target) {
         this.feed(target);
 
         this.noticeService.create()
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/fly/FlyCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/fly/FlyCommand.java
index 9f43cddcf..8fd8ed8f4 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/fly/FlyCommand.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/fly/FlyCommand.java
@@ -6,7 +6,7 @@
 import com.eternalcode.core.viewer.Viewer;
 import dev.rollczi.litecommands.annotations.argument.Arg;
 import dev.rollczi.litecommands.annotations.command.Command;
-import dev.rollczi.litecommands.annotations.context.Context;
+import dev.rollczi.litecommands.annotations.context.Sender;
 import dev.rollczi.litecommands.annotations.execute.Execute;
 import dev.rollczi.litecommands.annotations.permission.Permission;
 import org.bukkit.entity.Player;
@@ -24,7 +24,7 @@ class FlyCommand {
     @Execute
     @Permission("eternalcore.fly")
     @DescriptionDocs(description = "Toggle fly mode")
-    void execute(@Context Player player) {
+    void execute(@Sender Player player) {
         player.setAllowFlight(!player.getAllowFlight());
 
         this.noticeService.create()
@@ -37,7 +37,7 @@ void execute(@Context Player player) {
     @Execute
     @Permission("eternalcore.fly.other")
     @DescriptionDocs(description = "Toggle fly mode for specified player", arguments = "<player>")
-    void execute(@Context Viewer viewer, @Arg Player target) {
+    void execute(@Sender Viewer viewer, @Arg Player target) {
         target.setAllowFlight(!target.getAllowFlight());
 
         this.noticeService.create()
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/fun/catboy/CatboyCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/fun/catboy/CatboyCommand.java
index b935ff641..c040cfe80 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/fun/catboy/CatboyCommand.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/fun/catboy/CatboyCommand.java
@@ -5,14 +5,13 @@
 import com.eternalcode.core.injector.annotations.Inject;
 import dev.rollczi.litecommands.annotations.argument.Arg;
 import dev.rollczi.litecommands.annotations.command.Command;
-import dev.rollczi.litecommands.annotations.context.Context;
+import dev.rollczi.litecommands.annotations.context.Sender;
 import dev.rollczi.litecommands.annotations.execute.Execute;
 import dev.rollczi.litecommands.annotations.permission.Permission;
+import java.util.Optional;
 import org.bukkit.entity.Cat;
 import org.bukkit.entity.Player;
 
-import java.util.Optional;
-
 @Command(name = "catboy")
 @Permission("eternalcore.catboy")
 class CatboyCommand {
@@ -26,7 +25,7 @@ class CatboyCommand {
 
     @Execute
     @DescriptionDocs(description = "Mark yourself as a catboy.", arguments = "[type]")
-    void executeCatboySelf(@Context Player player, @Arg("type") Optional<Cat.Type> type) {
+    void executeCatboySelf(@Sender Player player, @Arg("type") Optional<Cat.Type> type) {
         this.switchCatboy(player, type);
     }
 
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/fun/demoscreen/DemoScreenCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/fun/demoscreen/DemoScreenCommand.java
index 507e08d4c..5fb49241e 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/fun/demoscreen/DemoScreenCommand.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/fun/demoscreen/DemoScreenCommand.java
@@ -7,7 +7,7 @@
 import com.eternalcode.core.notice.NoticeService;
 import dev.rollczi.litecommands.annotations.argument.Arg;
 import dev.rollczi.litecommands.annotations.command.Command;
-import dev.rollczi.litecommands.annotations.context.Context;
+import dev.rollczi.litecommands.annotations.context.Sender;
 import dev.rollczi.litecommands.annotations.execute.Execute;
 import dev.rollczi.litecommands.annotations.permission.Permission;
 import org.bukkit.entity.Player;
@@ -26,7 +26,7 @@ public DemoScreenCommand(NoticeService noticeService) {
 
     @Execute
     @DescriptionDocs(description = {"Show a demo screen to yourself"})
-    void self(@Context Player sender) {
+    void self(@Sender Player sender) {
         sender.showDemoScreen();
 
         this.noticeService.create()
@@ -37,7 +37,7 @@ void self(@Context Player sender) {
 
     @Execute
     @DescriptionDocs(description = {"Show a demo screen to a player"}, arguments = {"<player>"})
-    void other(@Context Player sender, @Arg Player target) {
+    void other(@Sender Player sender, @Arg Player target) {
         target.showDemoScreen();
 
         this.noticeService.create()
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/fun/elderguardian/ElderGuardianCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/fun/elderguardian/ElderGuardianCommand.java
index bca2690c5..2d83b075b 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/fun/elderguardian/ElderGuardianCommand.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/fun/elderguardian/ElderGuardianCommand.java
@@ -8,7 +8,7 @@
 import com.eternalcode.paper.PaperOverlay;
 import dev.rollczi.litecommands.annotations.argument.Arg;
 import dev.rollczi.litecommands.annotations.command.Command;
-import dev.rollczi.litecommands.annotations.context.Context;
+import dev.rollczi.litecommands.annotations.context.Sender;
 import dev.rollczi.litecommands.annotations.execute.Execute;
 import dev.rollczi.litecommands.annotations.flag.Flag;
 import dev.rollczi.litecommands.annotations.permission.Permission;
@@ -28,7 +28,7 @@ public ElderGuardianCommand(NoticeService noticeService) {
 
     @Execute
     @DescriptionDocs(description = {"Show an elder guardian to a player"}, arguments = {"<player>", "[-s]"})
-    void execute(@Context Player sender, @Arg Player target, @Flag("-s") boolean silent) {
+    void execute(@Sender Player sender, @Arg Player target, @Flag("-s") boolean silent) {
         if (silent) {
             PaperOverlay.ELDER_GUARDIAN_SILENT.show(target);
 
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/fun/endscreen/EndScreenCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/fun/endscreen/EndScreenCommand.java
index d0d9a5b60..af1ceb739 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/fun/endscreen/EndScreenCommand.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/fun/endscreen/EndScreenCommand.java
@@ -8,7 +8,7 @@
 import com.eternalcode.paper.PaperOverlay;
 import dev.rollczi.litecommands.annotations.argument.Arg;
 import dev.rollczi.litecommands.annotations.command.Command;
-import dev.rollczi.litecommands.annotations.context.Context;
+import dev.rollczi.litecommands.annotations.context.Sender;
 import dev.rollczi.litecommands.annotations.execute.Execute;
 import dev.rollczi.litecommands.annotations.permission.Permission;
 import org.bukkit.entity.Player;
@@ -27,7 +27,7 @@ public EndScreenCommand(NoticeService noticeService) {
 
     @Execute
     @DescriptionDocs(description = "Show a end screen to yourself")
-    void self(@Context Player sender) {
+    void self(@Sender Player sender) {
         PaperOverlay.END_SCREEN.show(sender);
 
         this.noticeService.create()
@@ -38,7 +38,7 @@ void self(@Context Player sender) {
 
     @Execute
     @DescriptionDocs(description = "Show a end screen to a player", arguments = "<player>")
-    void other(@Context Player sender, @Arg Player target) {
+    void other(@Sender Player sender, @Arg Player target) {
         PaperOverlay.END_SCREEN.show(target);
 
         this.noticeService.create()
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/gamemode/GameModeCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/gamemode/GameModeCommand.java
index cd727eb99..b072f1531 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/gamemode/GameModeCommand.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/gamemode/GameModeCommand.java
@@ -1,15 +1,16 @@
 package com.eternalcode.core.feature.gamemode;
 
 import com.eternalcode.annotations.scan.command.DescriptionDocs;
-import com.eternalcode.core.litecommand.configurator.config.CommandConfiguration;
 import com.eternalcode.core.injector.annotations.Inject;
+import com.eternalcode.core.litecommand.configurator.config.CommandConfiguration;
 import com.eternalcode.core.notice.NoticeService;
 import com.eternalcode.core.viewer.Viewer;
 import dev.rollczi.litecommands.annotations.argument.Arg;
+import dev.rollczi.litecommands.annotations.command.Command;
 import dev.rollczi.litecommands.annotations.context.Context;
+import dev.rollczi.litecommands.annotations.context.Sender;
 import dev.rollczi.litecommands.annotations.execute.Execute;
 import dev.rollczi.litecommands.annotations.permission.Permission;
-import dev.rollczi.litecommands.annotations.command.Command;
 import dev.rollczi.litecommands.invalidusage.InvalidUsage;
 import dev.rollczi.litecommands.invalidusage.InvalidUsageException;
 import dev.rollczi.litecommands.invocation.Invocation;
@@ -31,7 +32,7 @@ class GameModeCommand {
 
     @Execute
     @Permission("eternalcore.gamemode")
-    void executeAlias(@Context Invocation<CommandSender> invocation, @Context Player player) {
+    void executeAlias(@Context Invocation<CommandSender> invocation, @Sender Player player) {
         GameMode gameMode = this.commandConfiguration.getGameMode(invocation.label());
 
         if (gameMode == null) {
@@ -44,7 +45,7 @@ void executeAlias(@Context Invocation<CommandSender> invocation, @Context Player
     @Execute
     @Permission("eternalcore.gamemode")
     @DescriptionDocs(description = "Sets your gamemode", arguments = "<gamemode>")
-    void execute(@Context Player sender, @Arg GameMode gameMode) {
+    void execute(@Sender Player sender, @Arg GameMode gameMode) {
         sender.setGameMode(gameMode);
 
         this.noticeService.create()
@@ -57,7 +58,7 @@ void execute(@Context Player sender, @Arg GameMode gameMode) {
     @Execute
     @Permission("eternalcore.gamemode.other")
     @DescriptionDocs(description = "Sets gamemode of another player", arguments = "<gamemode> <player>")
-    void execute(@Context Viewer sender, @Arg GameMode gameMode, @Arg Player player) {
+    void execute(@Sender Viewer sender, @Arg GameMode gameMode, @Arg Player player) {
         player.setGameMode(gameMode);
 
         this.noticeService.create()
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/give/GiveCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/give/GiveCommand.java
index fbd968afd..fec6fb585 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/give/GiveCommand.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/give/GiveCommand.java
@@ -7,11 +7,11 @@
 import com.eternalcode.core.notice.NoticeService;
 import com.eternalcode.core.util.MaterialUtil;
 import dev.rollczi.litecommands.annotations.argument.Arg;
-import dev.rollczi.litecommands.annotations.context.Context;
+import dev.rollczi.litecommands.annotations.command.Command;
+import dev.rollczi.litecommands.annotations.context.Sender;
 import dev.rollczi.litecommands.annotations.execute.Execute;
 import dev.rollczi.litecommands.annotations.optional.OptionalArg;
 import dev.rollczi.litecommands.annotations.permission.Permission;
-import dev.rollczi.litecommands.annotations.command.Command;
 import org.bukkit.Material;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -33,19 +33,19 @@ class GiveCommand {
 
     @Execute
     @DescriptionDocs(description = "Gives you an item", arguments = "<item>")
-    void execute(@Context Player player, @Arg Material material) {
+    void execute(@Sender Player player, @Arg Material material) {
         this.execute(player, material, this.config.items.defaultGiveAmount);
     }
 
     @Execute
     @DescriptionDocs(description = "Gives an item to another player", arguments = "<player> <item>")
-    void execute(@Context CommandSender sender, @OptionalArg Player target, @Arg Material material) {
+    void execute(@Sender CommandSender sender, @OptionalArg Player target, @Arg Material material) {
         this.execute(sender, target, material, this.config.items.defaultGiveAmount);
     }
 
     @Execute
     @DescriptionDocs(description = "Gives you an item with a custom amount", arguments = "<item> [amount]")
-    void execute(@Context Player player, @Arg Material material, @OptionalArg(StackAmountArgument.KEY) int amount) {
+    void execute(@Sender Player player, @Arg Material material, @OptionalArg(StackAmountArgument.KEY) int amount) {
         boolean isSuccess = this.giveService.giveItem(player, player, material, amount);
 
         if (isSuccess) {
@@ -59,7 +59,7 @@ void execute(@Context Player player, @Arg Material material, @OptionalArg(StackA
 
     @Execute
     @DescriptionDocs(description = "Gives an item with a custom amount to another player", arguments = "<player> <item> <amount>")
-    void execute(@Context CommandSender sender, @OptionalArg Player target, @Arg Material material, @OptionalArg(StackAmountArgument.KEY) int amount) {
+    void execute(@Sender CommandSender sender, @OptionalArg Player target, @Arg Material material, @OptionalArg(StackAmountArgument.KEY) int amount) {
         boolean isSuccess = this.giveService.giveItem(sender, target, material, amount);
 
         if (!isSuccess) {
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/godmode/GodCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/godmode/GodCommand.java
index a8dde1093..83edbff19 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/godmode/GodCommand.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/godmode/GodCommand.java
@@ -6,7 +6,7 @@
 import com.eternalcode.core.viewer.Viewer;
 import dev.rollczi.litecommands.annotations.argument.Arg;
 import dev.rollczi.litecommands.annotations.command.Command;
-import dev.rollczi.litecommands.annotations.context.Context;
+import dev.rollczi.litecommands.annotations.context.Sender;
 import dev.rollczi.litecommands.annotations.execute.Execute;
 import dev.rollczi.litecommands.annotations.permission.Permission;
 import org.bukkit.entity.Player;
@@ -24,7 +24,7 @@ class GodCommand {
     @Execute
     @Permission("eternalcore.god")
     @DescriptionDocs(description = "Toggle god mode")
-    void execute(@Context Player sender) {
+    void execute(@Sender Player sender) {
         sender.setInvulnerable(!sender.isInvulnerable());
 
         this.noticeService.create()
@@ -41,7 +41,7 @@ void execute(@Context Player sender) {
     @Execute
     @Permission("eternalcore.god.other")
     @DescriptionDocs(description = "Toggle god mode for specified player", arguments = "<player>")
-    void execute(@Context Viewer viewer, @Arg Player target) {
+    void execute(@Sender Viewer viewer, @Arg Player target) {
         target.setInvulnerable(!target.isInvulnerable());
 
         this.noticeService.create()
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/hat/HatCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/hat/HatCommand.java
index 9298db1c6..397549b5b 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/hat/HatCommand.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/hat/HatCommand.java
@@ -4,10 +4,10 @@
 import com.eternalcode.commons.bukkit.ItemUtil;
 import com.eternalcode.core.injector.annotations.Inject;
 import com.eternalcode.core.notice.NoticeService;
-import dev.rollczi.litecommands.annotations.context.Context;
+import dev.rollczi.litecommands.annotations.command.Command;
+import dev.rollczi.litecommands.annotations.context.Sender;
 import dev.rollczi.litecommands.annotations.execute.Execute;
 import dev.rollczi.litecommands.annotations.permission.Permission;
-import dev.rollczi.litecommands.annotations.command.Command;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.PlayerInventory;
@@ -25,7 +25,7 @@ class HatCommand {
 
     @Execute
     @DescriptionDocs(description = "Puts item in hand on head")
-    void execute(@Context Player player) {
+    void execute(@Sender Player player) {
         PlayerInventory playerInventory = player.getInventory();
 
         ItemStack itemStack = playerInventory.getHelmet();
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/heal/HealCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/heal/HealCommand.java
index 1ce5beff4..102a07435 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/heal/HealCommand.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/heal/HealCommand.java
@@ -7,7 +7,7 @@
 import com.eternalcode.core.viewer.Viewer;
 import dev.rollczi.litecommands.annotations.argument.Arg;
 import dev.rollczi.litecommands.annotations.command.Command;
-import dev.rollczi.litecommands.annotations.context.Context;
+import dev.rollczi.litecommands.annotations.context.Sender;
 import dev.rollczi.litecommands.annotations.execute.Execute;
 import dev.rollczi.litecommands.annotations.permission.Permission;
 import org.bukkit.entity.Player;
@@ -26,7 +26,7 @@ class HealCommand {
     @Execute
     @Permission("eternalcore.heal")
     @DescriptionDocs(description = "Heal yourself")
-    void healSelf(@Context Player player) {
+    void healSelf(@Sender Player player) {
         this.heal(player);
 
         this.noticeService.player(player.getUniqueId(), translation -> translation.player().healMessage());
@@ -35,7 +35,7 @@ void healSelf(@Context Player player) {
     @Execute
     @Permission("eternalcore.heal.other")
     @DescriptionDocs(description = "Heal other player", arguments = "<player>")
-    void healOther(@Context Viewer viewer, @Arg Player target) {
+    void healOther(@Sender Viewer viewer, @Arg Player target) {
         this.heal(target);
 
         this.noticeService.create()
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/helpop/HelpOpCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/helpop/HelpOpCommand.java
index 2db25dc63..ad77e0d31 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/helpop/HelpOpCommand.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/helpop/HelpOpCommand.java
@@ -10,7 +10,7 @@
 import com.eternalcode.core.util.DurationUtil;
 import com.eternalcode.multification.notice.NoticeBroadcast;
 import dev.rollczi.litecommands.annotations.command.Command;
-import dev.rollczi.litecommands.annotations.context.Context;
+import dev.rollczi.litecommands.annotations.context.Sender;
 import dev.rollczi.litecommands.annotations.execute.Execute;
 import dev.rollczi.litecommands.annotations.join.Join;
 import dev.rollczi.litecommands.annotations.permission.Permission;
@@ -47,7 +47,7 @@ class HelpOpCommand {
 
     @Execute
     @DescriptionDocs(description = "Send helpop message to all administrator with eternalcore.helpop.spy permission", arguments = "<message>")
-    void execute(@Context Player player, @Join String message) {
+    void execute(@Sender Player player, @Join String message) {
         UUID uuid = player.getUniqueId();
         HelpOpEvent event = new HelpOpEvent(player, message);
 
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/home/command/HomeCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/home/command/HomeCommand.java
index d511d228d..d71a93e52 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/home/command/HomeCommand.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/home/command/HomeCommand.java
@@ -9,7 +9,7 @@
 import com.eternalcode.core.notice.NoticeService;
 import dev.rollczi.litecommands.annotations.argument.Arg;
 import dev.rollczi.litecommands.annotations.command.Command;
-import dev.rollczi.litecommands.annotations.context.Context;
+import dev.rollczi.litecommands.annotations.context.Sender;
 import dev.rollczi.litecommands.annotations.execute.Execute;
 import dev.rollczi.litecommands.annotations.permission.Permission;
 import java.util.Collection;
@@ -40,7 +40,7 @@ class HomeCommand {
 
     @Execute
     @DescriptionDocs(description = "Teleports to the first home if the player has no other homes set, if player has eternalcore.home.bypass permission, eternalcore will ignore teleport time")
-    void execute(@Context Player player) {
+    void execute(@Sender Player player) {
         Collection<Home> playerHomes = this.homeService.getHomes(player.getUniqueId());
 
         if (playerHomes.isEmpty()) {
@@ -82,7 +82,7 @@ void execute(@Context Player player) {
 
     @Execute
     @DescriptionDocs(description = "Teleport to home, if player has eternalcore.home.bypass permission, eternalcore will be ignore teleport time", arguments = "<home>")
-    void execute(@Context Player player, @Arg Home home) {
+    void execute(@Sender Player player, @Arg Home home) {
         this.homeTeleportService.teleport(player, home);
     }
 }
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/home/command/SetHomeCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/home/command/SetHomeCommand.java
index 605a142f8..1ef8e6c18 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/home/command/SetHomeCommand.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/home/command/SetHomeCommand.java
@@ -11,6 +11,7 @@
 import dev.rollczi.litecommands.annotations.argument.Arg;
 import dev.rollczi.litecommands.annotations.command.Command;
 import dev.rollczi.litecommands.annotations.context.Context;
+import dev.rollczi.litecommands.annotations.context.Sender;
 import dev.rollczi.litecommands.annotations.execute.Execute;
 import dev.rollczi.litecommands.annotations.permission.Permission;
 import java.util.UUID;
@@ -40,13 +41,13 @@ class SetHomeCommand {
 
     @Execute
     @DescriptionDocs(description = "Set home location with specified name", arguments = "<home>")
-    void execute(@Context User user, @Context Player player, @Arg String home) {
+    void execute(@Sender User user, @Sender Player player, @Arg String home) {
         this.setOrOverrideHome(user, player, home);
     }
 
     @Execute
     @DescriptionDocs(description = "Set home location")
-    void execute(@Context User user, @Context Player player) {
+    void execute(@Sender User user, @Sender Player player) {
         this.setOrOverrideHome(user, player, this.homesSettings.defaultName());
     }
 
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/home/homeadmin/HomeAdminCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/home/homeadmin/HomeAdminCommand.java
index c30950cd8..60fd23b01 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/home/homeadmin/HomeAdminCommand.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/home/homeadmin/HomeAdminCommand.java
@@ -10,7 +10,7 @@
 import com.eternalcode.core.viewer.Viewer;
 import dev.rollczi.litecommands.annotations.argument.Arg;
 import dev.rollczi.litecommands.annotations.command.Command;
-import dev.rollczi.litecommands.annotations.context.Context;
+import dev.rollczi.litecommands.annotations.context.Sender;
 import dev.rollczi.litecommands.annotations.execute.Execute;
 import dev.rollczi.litecommands.annotations.permission.Permission;
 import io.papermc.lib.PaperLib;
@@ -41,7 +41,7 @@ public HomeAdminCommand(
 
     @Execute(name = "sethome")
     @DescriptionDocs(description = "Set home for user", arguments = "<user> <home> [location]")
-    void setHome(@Context Player sender, @Arg("player home") PlayerHomeEntry playerHomeEntry, @Arg Optional<Location> location) {
+    void setHome(@Sender Player sender, @Arg("player home") PlayerHomeEntry playerHomeEntry, @Arg Optional<Location> location) {
         Location optionalLocation = location.orElse(sender.getLocation());
 
         Home home = playerHomeEntry.home();
@@ -74,7 +74,7 @@ void setHome(@Context Player sender, @Arg("player home") PlayerHomeEntry playerH
 
     @Execute(name = "delhome")
     @DescriptionDocs(description = "Delete home for user", arguments = "<user> <home>")
-    void deleteHome(@Context Player sender, @Arg("player home") PlayerHomeEntry playerHomeEntry) {
+    void deleteHome(@Sender Player sender, @Arg("player home") PlayerHomeEntry playerHomeEntry) {
         Home home = playerHomeEntry.home();
         Player player = playerHomeEntry.player();
 
@@ -105,7 +105,7 @@ void deleteHome(@Context Player sender, @Arg("player home") PlayerHomeEntry play
 
     @Execute(name = "home")
     @DescriptionDocs(description = "Teleport to user home", arguments = "<user> <home>")
-    void home(@Context Player player, @Arg("player home") PlayerHomeEntry playerHomeEntry) {
+    void home(@Sender Player player, @Arg("player home") PlayerHomeEntry playerHomeEntry) {
         Home home = playerHomeEntry.home();
         Player user = playerHomeEntry.player();
 
@@ -127,7 +127,7 @@ void home(@Context Player player, @Arg("player home") PlayerHomeEntry playerHome
 
     @Execute(name = "list")
     @DescriptionDocs(description = "List user homes", arguments = "<user>")
-    void list(@Context Viewer viewer, @Arg User user) {
+    void list(@Sender Viewer viewer, @Arg User user) {
         String homes = this.formattedListUserHomes(user.getUniqueId());
 
         this.noticeService.create()
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/itemedit/ItemFlagCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/itemedit/ItemFlagCommand.java
index a33cdf435..ee3a07e5a 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/itemedit/ItemFlagCommand.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/itemedit/ItemFlagCommand.java
@@ -7,7 +7,7 @@
 import com.eternalcode.multification.shared.Formatter;
 import dev.rollczi.litecommands.annotations.argument.Arg;
 import dev.rollczi.litecommands.annotations.command.Command;
-import dev.rollczi.litecommands.annotations.context.Context;
+import dev.rollczi.litecommands.annotations.context.Sender;
 import dev.rollczi.litecommands.annotations.execute.Execute;
 import dev.rollczi.litecommands.annotations.permission.Permission;
 import org.bukkit.entity.Player;
@@ -30,7 +30,7 @@ class ItemFlagCommand {
 
     @Execute
     @DescriptionDocs(description = "Adds or removes item flag from item in hand", arguments = "<item-flag>")
-    void execute(@Context Player player, @Arg ItemFlag flag) {
+    void execute(@Sender Player player, @Arg ItemFlag flag) {
         ItemStack hand = player.getInventory().getItemInMainHand();
         ItemMeta meta = hand.getItemMeta();
 
@@ -55,7 +55,7 @@ void execute(@Context Player player, @Arg ItemFlag flag) {
 
     @Execute(name = "clear")
     @DescriptionDocs(description = "Clears all item flags from item in hand")
-    void clear(@Context Player player) {
+    void clear(@Sender Player player) {
         ItemStack hand = player.getInventory().getItemInMainHand();
         ItemMeta meta = hand.getItemMeta();
 
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/itemedit/ItemLoreCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/itemedit/ItemLoreCommand.java
index 60bfd4f50..1c2404d67 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/itemedit/ItemLoreCommand.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/itemedit/ItemLoreCommand.java
@@ -6,7 +6,7 @@
 import com.eternalcode.core.notice.NoticeService;
 import dev.rollczi.litecommands.annotations.argument.Arg;
 import dev.rollczi.litecommands.annotations.command.Command;
-import dev.rollczi.litecommands.annotations.context.Context;
+import dev.rollczi.litecommands.annotations.context.Sender;
 import dev.rollczi.litecommands.annotations.execute.Execute;
 import dev.rollczi.litecommands.annotations.join.Join;
 import dev.rollczi.litecommands.annotations.permission.Permission;
@@ -33,7 +33,7 @@ class ItemLoreCommand {
 
     @Execute
     @DescriptionDocs(description = "Sets lore of item in hand", arguments = "<line> <text>")
-    void execute(@Context Player player, @Arg(ItemLoreArgument.KEY) int line, @Join String text) {
+    void execute(@Sender Player player, @Arg(ItemLoreArgument.KEY) int line, @Join String text) {
         ItemStack itemStack = this.validateItemFromMainHand(player);
 
         if (itemStack == null) {
@@ -63,7 +63,7 @@ void execute(@Context Player player, @Arg(ItemLoreArgument.KEY) int line, @Join
 
     @Execute(name = "remove")
     @DescriptionDocs(description = "Removes a specific line of lore from the item in hand", arguments = "<line>")
-    void remove(@Context Player player, @Arg(ItemLoreArgument.KEY) int line) {
+    void remove(@Sender Player player, @Arg(ItemLoreArgument.KEY) int line) {
         ItemStack itemStack = this.validateItemFromMainHand(player);
 
         if (itemStack == null) {
@@ -97,7 +97,7 @@ void remove(@Context Player player, @Arg(ItemLoreArgument.KEY) int line) {
 
     @Execute(name = "clear")
     @DescriptionDocs(description = "Clears all lore from the item in hand")
-    void clear(@Context Player player) {
+    void clear(@Sender Player player) {
         ItemStack itemStack = this.validateItemFromMainHand(player);
 
         if (itemStack == null) {
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/itemedit/ItemNameCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/itemedit/ItemNameCommand.java
index 593d6d3b4..30b1188ce 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/itemedit/ItemNameCommand.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/itemedit/ItemNameCommand.java
@@ -4,13 +4,12 @@
 import com.eternalcode.commons.adventure.AdventureUtil;
 import com.eternalcode.core.injector.annotations.Inject;
 import com.eternalcode.core.notice.NoticeService;
-import dev.rollczi.litecommands.annotations.context.Context;
-import dev.rollczi.litecommands.annotations.join.Join;
+import dev.rollczi.litecommands.annotations.command.Command;
+import dev.rollczi.litecommands.annotations.context.Sender;
 import dev.rollczi.litecommands.annotations.execute.Execute;
+import dev.rollczi.litecommands.annotations.join.Join;
 import dev.rollczi.litecommands.annotations.permission.Permission;
-import dev.rollczi.litecommands.annotations.command.Command;
 import net.kyori.adventure.text.minimessage.MiniMessage;
-import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
@@ -31,7 +30,7 @@ class ItemNameCommand {
 
     @Execute
     @DescriptionDocs(description = "Sets name of item in hand", arguments = "<name>")
-    void execute(@Context Player player, @Join String name) {
+    void execute(@Sender Player player, @Join String name) {
         ItemStack itemStack = this.validateItemFromMainHand(player);
 
         if (itemStack == null) {
@@ -54,7 +53,7 @@ void execute(@Context Player player, @Join String name) {
 
     @Execute(name = "clear")
     @DescriptionDocs(description = "Clears name of item in hand")
-    void clear(@Context Player player) {
+    void clear(@Sender Player player) {
         ItemStack itemStack = this.validateItemFromMainHand(player);
 
         if (itemStack == null) {
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailCommand.java
index 7e4358954..c46e24605 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailCommand.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailCommand.java
@@ -8,7 +8,7 @@
 import dev.rollczi.litecommands.annotations.argument.Arg;
 import dev.rollczi.litecommands.annotations.async.Async;
 import dev.rollczi.litecommands.annotations.command.Command;
-import dev.rollczi.litecommands.annotations.context.Context;
+import dev.rollczi.litecommands.annotations.context.Sender;
 import dev.rollczi.litecommands.annotations.execute.Execute;
 import dev.rollczi.litecommands.annotations.permission.Permission;
 import java.time.Duration;
@@ -43,7 +43,7 @@ class JailCommand {
     @Execute(name = "setup")
     @Permission("eternalcore.jail.setup")
     @DescriptionDocs(description = "Define jail spawn area")
-    void executeJailSetup(@Context Player player) {
+    void executeJailSetup(@Sender Player player) {
         Location location = player.getLocation();
 
         boolean isLastJailSet = this.jailService.getJailAreaLocation().isPresent();
@@ -61,7 +61,7 @@ void executeJailSetup(@Context Player player) {
     @Execute(name = "setup")
     @Permission("eternalcore.jail.setup")
     @DescriptionDocs(description = "Define jail spawn area", arguments = "<location>")
-    void executeJailSetup(@Context Player player, @Arg Location location) {
+    void executeJailSetup(@Sender Player player, @Arg Location location) {
         boolean isLastJailSet = this.jailService.getJailAreaLocation().isPresent();
 
         location.setWorld(player.getWorld());
@@ -79,7 +79,7 @@ void executeJailSetup(@Context Player player, @Arg Location location) {
     @Execute(name = "remove")
     @Permission("eternalcore.jail.setup")
     @DescriptionDocs(description = "Remove jail spawn area")
-    void executeJailRemove(@Context Player player) {
+    void executeJailRemove(@Sender Player player) {
         if (this.isPrisonAvailable(player)) {
             return;
         }
@@ -95,21 +95,21 @@ void executeJailRemove(@Context Player player) {
     @Execute(name = "detain")
     @Permission("eternalcore.jail.detain")
     @DescriptionDocs(description = "Detain self")
-    void executeJailDetainSelf(@Context Player player) {
+    void executeJailDetainSelf(@Sender Player player) {
         this.executeJailDetainForTime(player, player, this.jailSettings.defaultJailDuration());
     }
 
     @Execute(name = "detain")
     @Permission("eternalcore.jail.detain")
     @DescriptionDocs(description = "Detain a player", arguments = "<player>")
-    void executeJailDetain(@Context Player player, @Arg Player target) {
+    void executeJailDetain(@Sender Player player, @Arg Player target) {
         this.executeJailDetainForTime(player, target, this.jailSettings.defaultJailDuration());
     }
 
     @Execute(name = "detain")
     @Permission("eternalcore.jail.detain")
     @DescriptionDocs(description = "Detain a player for some time", arguments = "<player> <time>")
-    void executeJailDetainForTime(@Context Player player, @Arg Player target, @Arg Duration duration) {
+    void executeJailDetainForTime(@Sender Player player, @Arg Player target, @Arg Duration duration) {
         if (this.isPrisonAvailable(player)) {
             return;
         }
@@ -150,14 +150,14 @@ void executeJailDetainForTime(@Context Player player, @Arg Player target, @Arg D
     @Execute(name = "release")
     @Permission("eternalcore.jail.release")
     @DescriptionDocs(description = "Release self from jail")
-    void executeJailReleaseSelf(@Context Player player) {
+    void executeJailReleaseSelf(@Sender Player player) {
         this.executeJailRelease(player, player);
     }
 
     @Execute(name = "release")
     @Permission("eternalcore.jail.release")
     @DescriptionDocs(description = "Release a player from jail", arguments = "<player>")
-    void executeJailRelease(@Context Player player, @Arg Player target) {
+    void executeJailRelease(@Sender Player player, @Arg Player target) {
         if (!this.jailService.isPlayerJailed(target.getUniqueId())) {
             this.noticeService.create()
                 .notice(translation -> translation.jailSection().jailIsNotPrisoner())
@@ -184,7 +184,7 @@ void executeJailRelease(@Context Player player, @Arg Player target) {
     @Execute(name = "release -all", aliases = { "release *" })
     @Permission("eternalcore.jail.release")
     @DescriptionDocs(description = "Release all players from jail")
-    void executeJailReleaseAll(@Context Player player) {
+    void executeJailReleaseAll(@Sender Player player) {
         if (this.jailService.getJailedPlayers().isEmpty()) {
             this.noticeService.create()
                 .notice(translation -> translation.jailSection().jailReleaseNoPlayers())
@@ -204,7 +204,7 @@ void executeJailReleaseAll(@Context Player player) {
     @Execute(name = "list")
     @Permission("eternalcore.jail.list")
     @DescriptionDocs(description = "List all jailed players")
-    void executeJailList(@Context Player player) {
+    void executeJailList(@Sender Player player) {
         if (this.jailService.getJailedPlayers().isEmpty()) {
             this.noticeService.create()
                 .notice(translation -> translation.jailSection().jailListEmpty())
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/kill/KillCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/kill/KillCommand.java
index 07a65936f..d1bd177be 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/kill/KillCommand.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/kill/KillCommand.java
@@ -7,7 +7,7 @@
 import com.eternalcode.core.viewer.Viewer;
 import dev.rollczi.litecommands.annotations.argument.Arg;
 import dev.rollczi.litecommands.annotations.command.Command;
-import dev.rollczi.litecommands.annotations.context.Context;
+import dev.rollczi.litecommands.annotations.context.Sender;
 import dev.rollczi.litecommands.annotations.execute.Execute;
 import dev.rollczi.litecommands.annotations.permission.Permission;
 import org.bukkit.entity.Player;
@@ -27,7 +27,7 @@ class KillCommand {
 
     @Execute
     @DescriptionDocs(description = "Kill yourself")
-    void execute(@Context Player player) {
+    void execute(@Sender Player player) {
         player.setHealth(0);
 
         this.noticeService.create()
@@ -39,7 +39,7 @@ void execute(@Context Player player) {
 
     @Execute
     @DescriptionDocs(description = "Kill specified player", arguments = "<player>")
-    void execute(@Context Viewer audience, @Arg Player player) {
+    void execute(@Sender Viewer audience, @Arg Player player) {
         this.scheduler.run(player, () -> player.setHealth(0));
 
         this.noticeService.create()
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/msg/MsgCommands.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/msg/MsgCommands.java
index 56f4cb6e4..e8470653f 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/msg/MsgCommands.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/msg/MsgCommands.java
@@ -5,7 +5,7 @@
 import com.eternalcode.core.notice.NoticeService;
 import dev.rollczi.litecommands.annotations.argument.Arg;
 import dev.rollczi.litecommands.annotations.command.RootCommand;
-import dev.rollczi.litecommands.annotations.context.Context;
+import dev.rollczi.litecommands.annotations.context.Sender;
 import dev.rollczi.litecommands.annotations.execute.Execute;
 import dev.rollczi.litecommands.annotations.join.Join;
 import dev.rollczi.litecommands.annotations.permission.Permission;
@@ -30,21 +30,21 @@ class MsgCommands {
     @Execute(name = "msg", aliases = { "message", "m", "whisper", "tell", "t" })
     @Permission("eternalcore.msg")
     @DescriptionDocs(description = "Send private message to specified player", arguments = "<player> <message>")
-    void execute(@Context Player sender, @Arg Player target, @Join String message) {
+    void execute(@Sender Player sender, @Arg Player target, @Join String message) {
         this.msgService.sendMessage(sender, target, message);
     }
 
     @Execute(name = "reply", aliases = { "r" })
     @Permission("eternalcore.reply")
     @DescriptionDocs(description = "Reply to last private message", arguments = "<message>")
-    void execute(@Context Player sender, @Join String message) {
+    void execute(@Sender Player sender, @Join String message) {
         this.msgService.reply(sender, message);
     }
 
     @Execute(name = "socialspy", aliases = { "spy" })
     @Permission("eternalcore.spy")
     @DescriptionDocs(description = "Enable or disable social spy")
-    void socialSpy(@Context Player player) {
+    void socialSpy(@Sender Player player) {
         UUID uuid = player.getUniqueId();
 
         if (this.msgService.isSpy(uuid)) {
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/msg/toggle/MsgToggleCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/msg/toggle/MsgToggleCommand.java
index 4d0725f02..c83a878ef 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/msg/toggle/MsgToggleCommand.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/msg/toggle/MsgToggleCommand.java
@@ -5,7 +5,7 @@
 import com.eternalcode.core.notice.NoticeService;
 import dev.rollczi.litecommands.annotations.argument.Arg;
 import dev.rollczi.litecommands.annotations.command.Command;
-import dev.rollczi.litecommands.annotations.context.Context;
+import dev.rollczi.litecommands.annotations.context.Sender;
 import dev.rollczi.litecommands.annotations.execute.Execute;
 import dev.rollczi.litecommands.annotations.permission.Permission;
 import java.util.UUID;
@@ -27,7 +27,7 @@ class MsgToggleCommand {
 
     @Execute
     @DescriptionDocs(description = "Toggle receiving private messages")
-    void execute(@Context Player sender) {
+    void execute(@Sender Player sender) {
         UUID player = sender.getUniqueId();
         this.msgToggleService.toggleState(player)
             .thenAccept(toggledState -> noticePlayer(toggledState, player));
@@ -35,7 +35,7 @@ void execute(@Context Player sender) {
 
     @Execute(name = "enable")
     @DescriptionDocs(description = "Enable receiving private messages")
-    void executeEnable(@Context Player sender, @Arg MsgState state) {
+    void executeEnable(@Sender Player sender, @Arg MsgState state) {
         UUID player = sender.getUniqueId();
         this.msgToggleService.setState(player, MsgState.ENABLED)
             .thenAccept(ignored -> noticePlayer(MsgState.ENABLED, player));
@@ -43,7 +43,7 @@ void executeEnable(@Context Player sender, @Arg MsgState state) {
 
     @Execute(name = "disable")
     @DescriptionDocs(description = "Disable receiving private messages")
-    void executeDisable(@Context Player sender) {
+    void executeDisable(@Sender Player sender) {
         UUID player = sender.getUniqueId();
         this.msgToggleService.setState(player, MsgState.DISABLED)
             .thenAccept(ignored -> noticePlayer(MsgState.DISABLED, player));
@@ -52,7 +52,7 @@ void executeDisable(@Context Player sender) {
     @Execute
     @Permission("eternalcore.msgtoggle.other")
     @DescriptionDocs(description = "Switch receiving private messages for other player", arguments = "<player>")
-    void other(@Context CommandSender sender, @Arg Player target) {
+    void other(@Sender CommandSender sender, @Arg Player target) {
         UUID player = target.getUniqueId();
         this.msgToggleService.toggleState(player)
             .thenAccept(toggledState -> noticeOtherPlayer(sender, toggledState, target));
@@ -61,7 +61,7 @@ void other(@Context CommandSender sender, @Arg Player target) {
     @Execute
     @Permission("eternalcore.msgtoggle.other")
     @DescriptionDocs(description = "Switch receiving private messages for other player", arguments = "<player>  <toggle>")
-    void other(@Context CommandSender sender, @Arg Player target, @Arg MsgState state) {
+    void other(@Sender CommandSender sender, @Arg Player target, @Arg MsgState state) {
         UUID player = target.getUniqueId();
         this.msgToggleService.setState(player, state)
             .thenAccept(ignored -> noticeOtherPlayer(sender, state, target));
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/near/NearCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/near/NearCommand.java
index f23a7b3b1..3e1162401 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/near/NearCommand.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/near/NearCommand.java
@@ -2,13 +2,12 @@
 
 import com.eternalcode.annotations.scan.command.DescriptionDocs;
 import com.eternalcode.commons.bukkit.scheduler.MinecraftScheduler;
-import com.eternalcode.commons.scheduler.Scheduler;
 import com.eternalcode.core.glowing.GlowingService;
 import com.eternalcode.core.injector.annotations.Inject;
 import com.eternalcode.core.notice.NoticeService;
 import dev.rollczi.litecommands.annotations.argument.Arg;
 import dev.rollczi.litecommands.annotations.command.Command;
-import dev.rollczi.litecommands.annotations.context.Context;
+import dev.rollczi.litecommands.annotations.context.Sender;
 import dev.rollczi.litecommands.annotations.execute.Execute;
 import dev.rollczi.litecommands.annotations.permission.Permission;
 import java.time.Duration;
@@ -44,7 +43,7 @@ public NearCommand(GlowingService glowingService, NoticeService noticeService, M
 
     @Execute
     @DescriptionDocs(description = "Shows all players to the command sender.")
-    void showEntities(@Context Player player) {
+    void showEntities(@Sender Player player) {
         this.handleShowEntities(player, DEFAULT_RADIUS, DEFAULT_ENTITY_SCOPE);
     }
 
@@ -54,7 +53,7 @@ void showEntities(@Context Player player) {
         arguments = {"<entityScope> [radius]"}
     )
     void showEntitiesWithScope(
-        @Context Player sender,
+        @Sender Player sender,
         @Arg(EntityScopeArgument.KEY) EntityScope entityScope,
         @Arg Optional<Integer> radius
     ) {
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/playerinfo/OnlinePlayerCountCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/playerinfo/OnlinePlayerCountCommand.java
index 8a70897f1..98520b3dd 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/playerinfo/OnlinePlayerCountCommand.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/playerinfo/OnlinePlayerCountCommand.java
@@ -5,10 +5,10 @@
 import com.eternalcode.core.injector.annotations.Inject;
 import com.eternalcode.core.notice.NoticeService;
 import com.eternalcode.core.viewer.Viewer;
-import dev.rollczi.litecommands.annotations.context.Context;
+import dev.rollczi.litecommands.annotations.command.Command;
+import dev.rollczi.litecommands.annotations.context.Sender;
 import dev.rollczi.litecommands.annotations.execute.Execute;
 import dev.rollczi.litecommands.annotations.permission.Permission;
-import dev.rollczi.litecommands.annotations.command.Command;
 import org.bukkit.Server;
 
 @Command(name = "online")
@@ -28,7 +28,7 @@ class OnlinePlayerCountCommand {
 
     @Execute
     @DescriptionDocs(description = "Shows online players count")
-    void execute(@Context Viewer viewer) {
+    void execute(@Sender Viewer viewer) {
         long visiblePlayerCount = this.server.getOnlinePlayers().stream()
             .filter(player -> !this.vanishService.isVanished(player))
             .count();
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/playerinfo/OnlinePlayersListCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/playerinfo/OnlinePlayersListCommand.java
index 956ab226e..f708a7512 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/playerinfo/OnlinePlayersListCommand.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/playerinfo/OnlinePlayersListCommand.java
@@ -6,17 +6,16 @@
 import com.eternalcode.core.injector.annotations.Inject;
 import com.eternalcode.core.notice.NoticeService;
 import com.eternalcode.core.viewer.Viewer;
-import dev.rollczi.litecommands.annotations.context.Context;
+import dev.rollczi.litecommands.annotations.command.Command;
+import dev.rollczi.litecommands.annotations.context.Sender;
 import dev.rollczi.litecommands.annotations.execute.Execute;
 import dev.rollczi.litecommands.annotations.permission.Permission;
-import dev.rollczi.litecommands.annotations.command.Command;
+import java.util.Collection;
 import org.bukkit.Server;
 import org.bukkit.entity.HumanEntity;
 import org.bukkit.entity.Player;
 import panda.utilities.text.Joiner;
 
-import java.util.Collection;
-
 @Command(name = "list")
 @Permission("eternalcore.list")
 class OnlinePlayersListCommand {
@@ -37,7 +36,7 @@ class OnlinePlayersListCommand {
 
     @Execute
     @DescriptionDocs(description = "Shows online players list")
-    void execute(@Context Viewer viewer) {
+    void execute(@Sender Viewer viewer) {
         Collection<? extends Player> online = this.server.getOnlinePlayers()
             .stream()
             .filter(player -> !this.vanishService.isVanished(player))
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/playerinfo/PingCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/playerinfo/PingCommand.java
index 4bb03a8ce..280a94f43 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/playerinfo/PingCommand.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/playerinfo/PingCommand.java
@@ -5,10 +5,10 @@
 import com.eternalcode.core.notice.NoticeService;
 import com.eternalcode.core.viewer.Viewer;
 import dev.rollczi.litecommands.annotations.argument.Arg;
-import dev.rollczi.litecommands.annotations.context.Context;
+import dev.rollczi.litecommands.annotations.command.Command;
+import dev.rollczi.litecommands.annotations.context.Sender;
 import dev.rollczi.litecommands.annotations.execute.Execute;
 import dev.rollczi.litecommands.annotations.permission.Permission;
-import dev.rollczi.litecommands.annotations.command.Command;
 import org.bukkit.entity.Player;
 
 @Command(name = "ping")
@@ -24,7 +24,7 @@ class PingCommand {
     @Execute
     @Permission("eternalcore.ping")
     @DescriptionDocs(description = "Shows your ping")
-    void execute(@Context Player sender) {
+    void execute(@Sender Player sender) {
         this.noticeService.create()
             .notice(translation -> translation.player().pingMessage())
             .placeholder("{PING}", String.valueOf(sender.getPing()))
@@ -36,7 +36,7 @@ void execute(@Context Player sender) {
     @Execute
     @Permission("eternalcore.ping.other")
     @DescriptionDocs(description = "Shows ping of other player", arguments = "<player>")
-    void execute(@Context Viewer viewer, @Arg Player target) {
+    void execute(@Sender Viewer viewer, @Arg Player target) {
         this.noticeService.create()
             .notice(translation -> translation.player().pingOtherMessage())
             .placeholder("{PING}", String.valueOf(target.getPing()))
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/playerinfo/WhoIsCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/playerinfo/WhoIsCommand.java
index 4380813f6..551f3c281 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/playerinfo/WhoIsCommand.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/playerinfo/WhoIsCommand.java
@@ -5,10 +5,10 @@
 import com.eternalcode.core.notice.NoticeService;
 import com.eternalcode.core.viewer.Viewer;
 import dev.rollczi.litecommands.annotations.argument.Arg;
-import dev.rollczi.litecommands.annotations.context.Context;
+import dev.rollczi.litecommands.annotations.command.Command;
+import dev.rollczi.litecommands.annotations.context.Sender;
 import dev.rollczi.litecommands.annotations.execute.Execute;
 import dev.rollczi.litecommands.annotations.permission.Permission;
-import dev.rollczi.litecommands.annotations.command.Command;
 import org.bukkit.entity.Player;
 
 @Command(name = "whois")
@@ -24,7 +24,7 @@ class WhoIsCommand {
 
     @Execute
     @DescriptionDocs(description = "Shows information about player", arguments = "<player>")
-    void execute(@Context Viewer viewer, @Arg Player player) {
+    void execute(@Sender Viewer viewer, @Arg Player player) {
         this.noticeService.create()
             .placeholder("{PLAYER}", player.getName())
             .placeholder("{UUID}", String.valueOf(player.getUniqueId()))
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/playtime/PlaytimeCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/playtime/PlaytimeCommand.java
index 02bc49b9c..f819e11c8 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/playtime/PlaytimeCommand.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/playtime/PlaytimeCommand.java
@@ -6,14 +6,13 @@
 import com.eternalcode.core.util.DurationUtil;
 import dev.rollczi.litecommands.annotations.argument.Arg;
 import dev.rollczi.litecommands.annotations.command.Command;
-import dev.rollczi.litecommands.annotations.context.Context;
+import dev.rollczi.litecommands.annotations.context.Sender;
 import dev.rollczi.litecommands.annotations.execute.Execute;
 import dev.rollczi.litecommands.annotations.permission.Permission;
+import java.time.Duration;
 import org.bukkit.Statistic;
 import org.bukkit.entity.Player;
 
-import java.time.Duration;
-
 @Command(name = "playtime", aliases = "pt")
 @Permission("eternalcore.playtime")
 public class PlaytimeCommand {
@@ -27,7 +26,7 @@ public PlaytimeCommand(NoticeService noticeService) {
 
     @Execute
     @DescriptionDocs(description = "Shows your playtime")
-    void self(@Context Player player) {
+    void self(@Sender Player player) {
         this.noticeService.create()
             .notice(translation -> translation.playtime().self())
             .placeholder("{PLAYTIME}", this.formatPlaytime(player))
@@ -38,7 +37,7 @@ void self(@Context Player player) {
     @Execute
     @Permission("eternalcore.playtime.other")
     @DescriptionDocs(description = "Shows playtime of a player", arguments = "<player>")
-    void other(@Context Player player, @Arg Player target) {
+    void other(@Sender Player player, @Arg Player target) {
         this.noticeService.create()
             .notice(translation -> translation.playtime().other())
             .placeholder("{PLAYER}", target.getName())
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/randomteleport/RandomTeleportCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/randomteleport/RandomTeleportCommand.java
index f63bbf9f3..201a96bc1 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/randomteleport/RandomTeleportCommand.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/randomteleport/RandomTeleportCommand.java
@@ -13,7 +13,7 @@
 import com.eternalcode.core.viewer.Viewer;
 import dev.rollczi.litecommands.annotations.argument.Arg;
 import dev.rollczi.litecommands.annotations.command.Command;
-import dev.rollczi.litecommands.annotations.context.Context;
+import dev.rollczi.litecommands.annotations.context.Sender;
 import dev.rollczi.litecommands.annotations.execute.Execute;
 import dev.rollczi.litecommands.annotations.permission.Permission;
 import java.time.Duration;
@@ -46,7 +46,7 @@ class RandomTeleportCommand {
     @Execute
     @Permission(RTP_COMMAND_SELF)
     @DescriptionDocs(description = "Teleportation of the sender to a random location, if you want bypass cooldown use eternalcore.rtp.bypass permission")
-    void executeSelf(@Context Player player) {
+    void executeSelf(@Sender Player player) {
         UUID uuid = player.getUniqueId();
 
         if (this.hasRandomTeleportDelay(player)) {
@@ -74,7 +74,7 @@ void executeSelf(@Context Player player) {
     @Execute
     @Permission(RTP_COMMAND_OTHER)
     @DescriptionDocs(description = "Teleportation of a player to a random location.", arguments = "<player>")
-    void executeOther(@Context Viewer sender, @Arg Player player) {
+    void executeOther(@Sender Viewer sender, @Arg Player player) {
         UUID uuid = player.getUniqueId();
 
         if (this.hasRandomTeleportDelay(player)) {
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/repair/RepairCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/repair/RepairCommand.java
index 49c252078..3fa32d1c1 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/repair/RepairCommand.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/repair/RepairCommand.java
@@ -6,7 +6,7 @@
 import com.eternalcode.core.notice.NoticeService;
 import com.eternalcode.core.util.DurationUtil;
 import dev.rollczi.litecommands.annotations.command.Command;
-import dev.rollczi.litecommands.annotations.context.Context;
+import dev.rollczi.litecommands.annotations.context.Sender;
 import dev.rollczi.litecommands.annotations.execute.Execute;
 import dev.rollczi.litecommands.annotations.permission.Permission;
 import java.time.Duration;
@@ -35,7 +35,7 @@ class RepairCommand {
     @Execute
     @DescriptionDocs(description = "Repairs item in hand")
     @Permission("eternalcore.repair")
-    void repair(@Context Player player) {
+    void repair(@Sender Player player) {
         UUID uuid = player.getUniqueId();
 
         if (this.hasRepairDelay(uuid)) {
@@ -79,7 +79,7 @@ void repair(@Context Player player) {
     @Execute(name = "all")
     @Permission("eternalcore.repair.all")
     @DescriptionDocs(description = "Repairs all items in inventory")
-    void repairAll(@Context Player player) {
+    void repairAll(@Sender Player player) {
         UUID uuid = player.getUniqueId();
 
         if (this.hasRepairDelay(uuid)) {
@@ -123,7 +123,7 @@ void repairAll(@Context Player player) {
     @Execute(name = "armor")
     @Permission("eternalcore.repair.armor")
     @DescriptionDocs(description = "Repairs all items in armor")
-    void repairArmor(@Context Player player) {
+    void repairArmor(@Sender Player player) {
         UUID uuid = player.getUniqueId();
 
         if (this.hasRepairDelay(uuid)) {
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/seen/SeenCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/seen/SeenCommand.java
index 2c1085e32..f0a0d5f70 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/seen/SeenCommand.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/seen/SeenCommand.java
@@ -3,21 +3,18 @@
 import com.eternalcode.annotations.scan.command.DescriptionDocs;
 import com.eternalcode.core.injector.annotations.Inject;
 import com.eternalcode.core.notice.NoticeService;
-import com.eternalcode.core.user.User;
 import com.eternalcode.core.util.DurationUtil;
 import com.eternalcode.core.viewer.Viewer;
 import dev.rollczi.litecommands.annotations.argument.Arg;
 import dev.rollczi.litecommands.annotations.async.Async;
 import dev.rollczi.litecommands.annotations.command.Command;
-import dev.rollczi.litecommands.annotations.context.Context;
+import dev.rollczi.litecommands.annotations.context.Sender;
 import dev.rollczi.litecommands.annotations.execute.Execute;
 import dev.rollczi.litecommands.annotations.permission.Permission;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.Server;
-
 import java.time.Duration;
 import java.time.Instant;
-import org.bukkit.entity.Player;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.Server;
 
 @Command(name = "seen", aliases = { "lastonline" })
 @Permission("eternalcore.seen")
@@ -35,7 +32,7 @@ public SeenCommand(Server server, NoticeService noticeService) {
 
     @Execute
     @DescriptionDocs(description = "Shows when the player was last seen on the server")
-    void execute(@Context Viewer sender, @Arg @Async OfflinePlayer target) {
+    void execute(@Sender Viewer sender, @Arg @Async OfflinePlayer target) {
         OfflinePlayer targetPlayer = this.server.getOfflinePlayer(target.getUniqueId());
 
         if (targetPlayer.isOnline()) {
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/setslot/SetSlotCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/setslot/SetSlotCommand.java
index c5ffbf0d0..46c459b4d 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/setslot/SetSlotCommand.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/setslot/SetSlotCommand.java
@@ -7,7 +7,7 @@
 import dev.rollczi.litecommands.annotations.argument.Arg;
 import dev.rollczi.litecommands.annotations.async.Async;
 import dev.rollczi.litecommands.annotations.command.Command;
-import dev.rollczi.litecommands.annotations.context.Context;
+import dev.rollczi.litecommands.annotations.context.Sender;
 import dev.rollczi.litecommands.annotations.execute.Execute;
 import dev.rollczi.litecommands.annotations.permission.Permission;
 
@@ -30,7 +30,7 @@ public SetSlotCommand(
     @Execute
     @Async
     @DescriptionDocs(description = "Set the max players on the server")
-    public void execute(@Context Viewer viewer, @Arg int slots) {
+    public void execute(@Sender Viewer viewer, @Arg int slots) {
         if (slots <= 0) {
             this.noticeService.create()
                 .notice(notice -> notice.argument().numberBiggerThanOrEqualZero())
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/signeditor/SignEditorCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/signeditor/SignEditorCommand.java
index ca7b6e432..229ea3344 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/signeditor/SignEditorCommand.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/signeditor/SignEditorCommand.java
@@ -7,7 +7,7 @@
 import com.eternalcode.core.notice.NoticeService;
 import dev.rollczi.litecommands.annotations.argument.Arg;
 import dev.rollczi.litecommands.annotations.command.Command;
-import dev.rollczi.litecommands.annotations.context.Context;
+import dev.rollczi.litecommands.annotations.context.Sender;
 import dev.rollczi.litecommands.annotations.execute.Execute;
 import dev.rollczi.litecommands.annotations.join.Join;
 import dev.rollczi.litecommands.annotations.permission.Permission;
@@ -31,7 +31,7 @@ public SignEditorCommand(NoticeService noticeService, MiniMessage miniMessage) {
     }
 
     @Execute(name = "set")
-    void execute(@Context Player player, @Arg int line, @Join String text) {
+    void execute(@Sender Player player, @Arg int line, @Join String text) {
         Block targetBlock = player.getTargetBlockExact(5);
 
         if (targetBlock == null) {
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/signeditor/SignSideEditorCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/signeditor/SignSideEditorCommand.java
index 07be53679..0f6fe23e6 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/signeditor/SignSideEditorCommand.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/signeditor/SignSideEditorCommand.java
@@ -7,7 +7,7 @@
 import com.eternalcode.core.notice.NoticeService;
 import dev.rollczi.litecommands.annotations.argument.Arg;
 import dev.rollczi.litecommands.annotations.command.Command;
-import dev.rollczi.litecommands.annotations.context.Context;
+import dev.rollczi.litecommands.annotations.context.Sender;
 import dev.rollczi.litecommands.annotations.execute.Execute;
 import dev.rollczi.litecommands.annotations.join.Join;
 import dev.rollczi.litecommands.annotations.permission.Permission;
@@ -33,7 +33,7 @@ public SignSideEditorCommand(NoticeService noticeService, MiniMessage miniMessag
     }
 
     @Execute(name = "set")
-    void execute(@Context Player player, @Arg Side side, @Arg int line, @Join String text) {
+    void execute(@Sender Player player, @Arg Side side, @Arg int line, @Join String text) {
         Block targetBlock = player.getTargetBlockExact(5);
 
         if (targetBlock == null) {
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/skull/SkullCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/skull/SkullCommand.java
index c152d2c6b..0f7d80978 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/skull/SkullCommand.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/skull/SkullCommand.java
@@ -4,10 +4,10 @@
 import com.eternalcode.core.injector.annotations.Inject;
 import com.eternalcode.core.notice.NoticeService;
 import dev.rollczi.litecommands.annotations.argument.Arg;
-import dev.rollczi.litecommands.annotations.context.Context;
+import dev.rollczi.litecommands.annotations.command.Command;
+import dev.rollczi.litecommands.annotations.context.Sender;
 import dev.rollczi.litecommands.annotations.execute.Execute;
 import dev.rollczi.litecommands.annotations.permission.Permission;
-import dev.rollczi.litecommands.annotations.command.Command;
 import dev.rollczi.liteskullapi.SkullAPI;
 import dev.triumphteam.gui.builder.item.ItemBuilder;
 import net.kyori.adventure.text.Component;
@@ -30,7 +30,7 @@ class SkullCommand {
 
     @Execute
     @DescriptionDocs(description = "Gives you a skull of player", arguments = "<player>")
-    void execute(@Context Player sender, @Arg(SkullNicknameArgument.KEY) String name) {
+    void execute(@Sender Player sender, @Arg(SkullNicknameArgument.KEY) String name) {
         this.skullAPI.acceptSkullData(name, skull -> {
             ItemStack namedSkull = ItemBuilder.skull()
                 .name(Component.text(name))
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/spawn/SetSpawnCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/spawn/SetSpawnCommand.java
index 62cdb9427..0162a01a3 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/spawn/SetSpawnCommand.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/spawn/SetSpawnCommand.java
@@ -5,7 +5,7 @@
 import com.eternalcode.core.notice.NoticeService;
 import dev.rollczi.litecommands.annotations.async.Async;
 import dev.rollczi.litecommands.annotations.command.Command;
-import dev.rollczi.litecommands.annotations.context.Context;
+import dev.rollczi.litecommands.annotations.context.Sender;
 import dev.rollczi.litecommands.annotations.execute.Execute;
 import dev.rollczi.litecommands.annotations.permission.Permission;
 import org.bukkit.entity.Player;
@@ -29,7 +29,7 @@ class SetSpawnCommand {
     @Async
     @Execute
     @DescriptionDocs(description = "Set spawn location")
-    void execute(@Context Player player) {
+    void execute(@Sender Player player) {
         this.spawnService.setSpawnLocation(player.getLocation());
 
         this.noticeService.create()
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/spawn/SpawnCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/spawn/SpawnCommand.java
index a9dc4a30f..fbb9d5a04 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/spawn/SpawnCommand.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/spawn/SpawnCommand.java
@@ -2,7 +2,6 @@
 
 import com.eternalcode.annotations.scan.command.DescriptionDocs;
 import com.eternalcode.annotations.scan.permission.PermissionDocs;
-import com.eternalcode.commons.bukkit.position.Position;
 import com.eternalcode.commons.bukkit.position.PositionAdapter;
 import com.eternalcode.core.feature.teleport.TeleportService;
 import com.eternalcode.core.feature.teleport.TeleportTaskService;
@@ -11,7 +10,7 @@
 import com.eternalcode.core.viewer.Viewer;
 import dev.rollczi.litecommands.annotations.argument.Arg;
 import dev.rollczi.litecommands.annotations.command.Command;
-import dev.rollczi.litecommands.annotations.context.Context;
+import dev.rollczi.litecommands.annotations.context.Sender;
 import dev.rollczi.litecommands.annotations.execute.Execute;
 import dev.rollczi.litecommands.annotations.permission.Permission;
 import java.time.Duration;
@@ -52,7 +51,7 @@ class SpawnCommand {
         permission = SPAWN_TELEPORT_BYPASS,
         description = "Allows you to bypass spawn teleportation time"
     )
-    void executeSelf(@Context Player sender) {
+    void executeSelf(@Sender Player sender) {
         Location spawnLocation = this.spawnService.getSpawnLocation();
 
         if (spawnLocation == null) {
@@ -100,7 +99,7 @@ void executeSelf(@Context Player sender) {
     @Execute
     @Permission("eternalcore.spawn.other")
     @DescriptionDocs(description = "Teleports specified player to spawn location", arguments = "<player>")
-    void execute(@Context Viewer sender, @Arg Player player) {
+    void execute(@Sender Viewer sender, @Arg Player player) {
         Location spawnLocation = this.spawnService.getSpawnLocation();
 
         if (spawnLocation == null) {
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/speed/SpeedCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/speed/SpeedCommand.java
index 1ba870de4..66737d842 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/speed/SpeedCommand.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/speed/SpeedCommand.java
@@ -5,10 +5,10 @@
 import com.eternalcode.core.notice.NoticeService;
 import com.eternalcode.core.viewer.Viewer;
 import dev.rollczi.litecommands.annotations.argument.Arg;
-import dev.rollczi.litecommands.annotations.context.Context;
+import dev.rollczi.litecommands.annotations.command.Command;
+import dev.rollczi.litecommands.annotations.context.Sender;
 import dev.rollczi.litecommands.annotations.execute.Execute;
 import dev.rollczi.litecommands.annotations.permission.Permission;
-import dev.rollczi.litecommands.annotations.command.Command;
 import org.bukkit.entity.Player;
 
 @Command(name = "speed")
@@ -24,7 +24,7 @@ class SpeedCommand {
 
     @Execute
     @DescriptionDocs(description = "Set speed depending on whether you flying or walking by specified amount", arguments = "<speed>")
-    void execute(@Context Player player, @Arg(SpeedArgument.KEY) Integer speed) {
+    void execute(@Sender Player player, @Arg(SpeedArgument.KEY) Integer speed) {
         this.setSpeed(player, speed);
 
         this.noticeService.create()
@@ -36,7 +36,7 @@ void execute(@Context Player player, @Arg(SpeedArgument.KEY) Integer speed) {
 
     @Execute
     @DescriptionDocs(description = "Set speed depending on whether the player is flying or walking by specified amount", arguments = "<speed> <player>")
-    void execute(@Context Viewer viewer, @Arg(SpeedArgument.KEY) Integer speed, @Arg Player target) {
+    void execute(@Sender Viewer viewer, @Arg(SpeedArgument.KEY) Integer speed, @Arg Player target) {
         this.setSpeed(target, speed);
 
         this.noticeService.create()
@@ -55,7 +55,7 @@ void execute(@Context Viewer viewer, @Arg(SpeedArgument.KEY) Integer speed, @Arg
 
     @Execute
     @DescriptionDocs(description = "Set speed of walking or flying to specified amount", arguments = "<type> <speed>")
-    void execute(@Context Player player, @Arg SpeedType speedType, @Arg(SpeedArgument.KEY) Integer speed) {
+    void execute(@Sender Player player, @Arg SpeedType speedType, @Arg(SpeedArgument.KEY) Integer speed) {
         this.setSpeed(player, speedType, speed);
 
         this.noticeService.create()
@@ -67,7 +67,7 @@ void execute(@Context Player player, @Arg SpeedType speedType, @Arg(SpeedArgumen
 
     @Execute
     @DescriptionDocs(description = "Set speed of walking or flying to specified amount and player", arguments = "<type> <speed> <player>")
-    void execute(@Context Viewer viewer, @Arg SpeedType speedType, @Arg(SpeedArgument.KEY) Integer speed, @Arg Player target) {
+    void execute(@Sender Viewer viewer, @Arg SpeedType speedType, @Arg(SpeedArgument.KEY) Integer speed, @Arg Player target) {
         this.setSpeed(target, speedType, speed);
 
         this.noticeService.create()
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/sudo/SudoCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/sudo/SudoCommand.java
index 5e58267c4..06ca18d95 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/sudo/SudoCommand.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/sudo/SudoCommand.java
@@ -7,7 +7,7 @@
 import com.eternalcode.core.viewer.Viewer;
 import dev.rollczi.litecommands.annotations.argument.Arg;
 import dev.rollczi.litecommands.annotations.command.Command;
-import dev.rollczi.litecommands.annotations.context.Context;
+import dev.rollczi.litecommands.annotations.context.Sender;
 import dev.rollczi.litecommands.annotations.execute.Execute;
 import dev.rollczi.litecommands.annotations.join.Join;
 import dev.rollczi.litecommands.annotations.permission.Permission;
@@ -37,7 +37,7 @@ class SudoCommand {
     @Execute(name = "-console")
     @Permission("eternalcore.sudo.console")
     @DescriptionDocs(description = "Execute command as console", arguments = "<command>")
-    void console(@Context Viewer viewer, @Join String command) {
+    void console(@Sender Viewer viewer, @Join String command) {
         this.server.dispatchCommand(this.server.getConsoleSender(), command);
         this.sendSudoSpy(viewer, this.server.getConsoleSender(), command);
     }
@@ -45,7 +45,7 @@ void console(@Context Viewer viewer, @Join String command) {
     @Execute
     @Permission("eternalcore.sudo.player")
     @DescriptionDocs(description = "Execute command as player", arguments = "<player> <command>")
-    void player(@Context Viewer viewer, @Arg Player target, @Join String command) {
+    void player(@Sender Viewer viewer, @Arg Player target, @Join String command) {
         this.server.dispatchCommand(target, command);
         this.sendSudoSpy(viewer, target, command);
     }
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleport/command/TeleportBackCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleport/command/TeleportBackCommand.java
index 86e557b53..078bb8bc4 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleport/command/TeleportBackCommand.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleport/command/TeleportBackCommand.java
@@ -10,7 +10,7 @@
 import com.eternalcode.core.viewer.Viewer;
 import dev.rollczi.litecommands.annotations.argument.Arg;
 import dev.rollczi.litecommands.annotations.command.Command;
-import dev.rollczi.litecommands.annotations.context.Context;
+import dev.rollczi.litecommands.annotations.context.Sender;
 import dev.rollczi.litecommands.annotations.execute.Execute;
 import dev.rollczi.litecommands.annotations.permission.Permission;
 import java.util.Optional;
@@ -36,7 +36,7 @@ class TeleportBackCommand {
     @Execute
     @Permission("eternalcore.back")
     @DescriptionDocs(description = "Teleport to last location")
-    void execute(@Context Player player) {
+    void execute(@Sender Player player) {
         Optional<Location> location = this.teleportService.getLastLocation(player.getUniqueId());
 
         if (location.isEmpty()) {
@@ -57,7 +57,7 @@ void execute(@Context Player player) {
     @Execute
     @Permission("eternalcore.back.other")
     @DescriptionDocs(description = "Teleport specified player to last location", arguments = "<player>")
-    void execute(@Context Viewer viewer, @Arg Player player) {
+    void execute(@Sender Viewer viewer, @Arg Player player) {
         Optional<Location> location = this.teleportService.getLastLocation(player.getUniqueId());
 
         if (location.isEmpty()) {
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleport/command/TeleportCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleport/command/TeleportCommand.java
index de9265a3e..efc0a0bc4 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleport/command/TeleportCommand.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleport/command/TeleportCommand.java
@@ -1,20 +1,20 @@
 package com.eternalcode.core.feature.teleport.command;
 
 import com.eternalcode.annotations.scan.command.DescriptionDocs;
+import com.eternalcode.core.feature.teleport.TeleportService;
 import com.eternalcode.core.injector.annotations.Inject;
 import com.eternalcode.core.notice.NoticeService;
 import com.eternalcode.core.placeholder.Placeholders;
-import com.eternalcode.core.feature.teleport.TeleportService;
 import com.eternalcode.core.viewer.Viewer;
+import com.eternalcode.multification.shared.Formatter;
 import dev.rollczi.litecommands.annotations.argument.Arg;
-import dev.rollczi.litecommands.annotations.context.Context;
+import dev.rollczi.litecommands.annotations.command.Command;
+import dev.rollczi.litecommands.annotations.context.Sender;
 import dev.rollczi.litecommands.annotations.execute.Execute;
 import dev.rollczi.litecommands.annotations.permission.Permission;
-import dev.rollczi.litecommands.annotations.command.Command;
 import org.bukkit.Location;
 import org.bukkit.World;
 import org.bukkit.entity.Player;
-import com.eternalcode.multification.shared.Formatter;
 
 @Command(name = "teleport", aliases = { "tp" })
 @Permission("eternalcore.teleport")
@@ -45,7 +45,7 @@ private record TeleportContext(Player player, Location location) {}
 
     @Execute
     @DescriptionDocs(description = "Teleport to specified player", arguments = "<player>")
-    void execute(@Context Player sender, @Context Viewer senderViewer, @Arg Player player) {
+    void execute(@Sender Player sender, @Sender Viewer senderViewer, @Arg Player player) {
         this.teleportService.teleport(sender, player.getLocation());
 
         Formatter formatter = this.formatter(player, player.getLocation());
@@ -55,7 +55,7 @@ void execute(@Context Player sender, @Context Viewer senderViewer, @Arg Player p
 
     @Execute
     @DescriptionDocs(description = "Teleport player to player", arguments = "<player> <target-player>")
-    void other(@Context Viewer sender, @Arg Player player, @Arg Player target) {
+    void other(@Sender Viewer sender, @Arg Player player, @Arg Player target) {
         this.teleportService.teleport(player, target.getLocation());
 
         Formatter formatter = this.formatter(player, target.getLocation());
@@ -66,7 +66,7 @@ void other(@Context Viewer sender, @Arg Player player, @Arg Player target) {
 
     @Execute
     @DescriptionDocs(description = "Teleport to specified location", arguments = "<x> <y> <z>")
-    void to(@Context Player sender, @Arg Location location) {
+    void to(@Sender Player sender, @Arg Location location) {
         location.setWorld(sender.getWorld());
 
         this.teleportService.teleport(sender, location);
@@ -78,7 +78,7 @@ void to(@Context Player sender, @Arg Location location) {
 
     @Execute
     @DescriptionDocs(description = "Teleport to specified location and world", arguments = "<x> <y> <z> <world>")
-    void to(@Context Player sender, @Arg Location location, @Arg World world) {
+    void to(@Sender Player sender, @Arg Location location, @Arg World world) {
         location.setWorld(world);
 
         this.teleportService.teleport(sender, location);
@@ -90,7 +90,7 @@ void to(@Context Player sender, @Arg Location location, @Arg World world) {
 
     @Execute
     @DescriptionDocs(description = "Teleport player to specified location and world", arguments = "<player> <x> <y> <z>")
-    void to(@Context Viewer sender, @Arg Player target, @Arg Location location) {
+    void to(@Sender Viewer sender, @Arg Player target, @Arg Location location) {
         location.setWorld(target.getWorld());
 
         Formatter formatter = this.formatter(target, location);
@@ -101,7 +101,7 @@ void to(@Context Viewer sender, @Arg Player target, @Arg Location location) {
 
     @Execute
     @DescriptionDocs(description = "Teleport player to specified player, location and world", arguments = "<player> <x> <y> <z> <world>")
-    void to(@Context Viewer sender, @Arg Player target, @Arg Location location, @Arg World world) {
+    void to(@Sender Viewer sender, @Arg Player target, @Arg Location location, @Arg World world) {
         location.setWorld(world);
 
         Formatter formatter = this.formatter(target, location);
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleport/command/TeleportToPositionCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleport/command/TeleportToPositionCommand.java
index a96f03e9c..824215400 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleport/command/TeleportToPositionCommand.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleport/command/TeleportToPositionCommand.java
@@ -1,15 +1,15 @@
 package com.eternalcode.core.feature.teleport.command;
 
 import com.eternalcode.annotations.scan.command.DescriptionDocs;
+import com.eternalcode.core.feature.teleport.TeleportService;
 import com.eternalcode.core.injector.annotations.Inject;
 import com.eternalcode.core.notice.NoticeService;
-import com.eternalcode.core.feature.teleport.TeleportService;
 import com.eternalcode.core.viewer.Viewer;
 import dev.rollczi.litecommands.annotations.argument.Arg;
-import dev.rollczi.litecommands.annotations.context.Context;
+import dev.rollczi.litecommands.annotations.command.Command;
+import dev.rollczi.litecommands.annotations.context.Sender;
 import dev.rollczi.litecommands.annotations.execute.Execute;
 import dev.rollczi.litecommands.annotations.permission.Permission;
-import dev.rollczi.litecommands.annotations.command.Command;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
 
@@ -28,13 +28,13 @@ class TeleportToPositionCommand {
 
     @Execute
     @DescriptionDocs(description = "Teleport to specified coordinates", arguments = "<x> <y> <z>")
-    void execute(@Context Player player, @Arg Location location) {
+    void execute(@Sender Player player, @Arg Location location) {
         this.teleport(player, location);
     }
 
     @Execute
     @DescriptionDocs(description = "Teleport specified player to specified coordinates", arguments = "<x> <y> <z> <player>")
-    void execute(@Context Viewer viewer, @Arg Location location, @Arg Player target) {
+    void execute(@Sender Viewer viewer, @Arg Location location, @Arg Player target) {
         this.teleport(target, location);
 
         this.noticeService.create()
@@ -42,7 +42,7 @@ void execute(@Context Viewer viewer, @Arg Location location, @Arg Player target)
             .placeholder("{PLAYER}", target.getName())
             .placeholder("{X}", String.valueOf(location.getX()))
             .placeholder("{Y}", String.valueOf(location.getY()))
-            .placeholder("{Z}", String.valueOf(location.getX()))
+            .placeholder("{Z}", String.valueOf(location.getZ()))
             .viewer(viewer)
             .send();
     }
@@ -55,7 +55,7 @@ private void teleport(Player player, Location location) {
             .notice(translation -> translation.teleport().teleportedToCoordinates())
             .placeholder("{X}", String.valueOf(location.getX()))
             .placeholder("{Y}", String.valueOf(location.getY()))
-            .placeholder("{Z}", String.valueOf(location.getX()))
+            .placeholder("{Z}", String.valueOf(location.getZ()))
             .player(player.getUniqueId())
             .send();
     }
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleport/command/TeleportUpCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleport/command/TeleportUpCommand.java
index 116555805..b1730dbae 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleport/command/TeleportUpCommand.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleport/command/TeleportUpCommand.java
@@ -1,13 +1,13 @@
 package com.eternalcode.core.feature.teleport.command;
 
 import com.eternalcode.annotations.scan.command.DescriptionDocs;
+import com.eternalcode.core.feature.teleport.TeleportService;
 import com.eternalcode.core.injector.annotations.Inject;
 import com.eternalcode.core.notice.NoticeService;
-import com.eternalcode.core.feature.teleport.TeleportService;
-import dev.rollczi.litecommands.annotations.context.Context;
+import dev.rollczi.litecommands.annotations.command.Command;
+import dev.rollczi.litecommands.annotations.context.Sender;
 import dev.rollczi.litecommands.annotations.execute.Execute;
 import dev.rollczi.litecommands.annotations.permission.Permission;
-import dev.rollczi.litecommands.annotations.command.Command;
 import org.bukkit.Location;
 import org.bukkit.World;
 import org.bukkit.entity.Player;
@@ -27,7 +27,7 @@ class TeleportUpCommand {
 
     @Execute
     @DescriptionDocs(description = "Teleport you to the highest block")
-    void tpUp(@Context Player player) {
+    void tpUp(@Sender Player player) {
         this.teleportPlayerToHighestBlock(player);
     }
 
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrandomplayer/TeleportToRandomPlayerCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrandomplayer/TeleportToRandomPlayerCommand.java
index d3c75803f..bf519c510 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrandomplayer/TeleportToRandomPlayerCommand.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrandomplayer/TeleportToRandomPlayerCommand.java
@@ -5,7 +5,7 @@
 import com.eternalcode.core.notice.NoticeService;
 import dev.rollczi.litecommands.annotations.argument.Arg;
 import dev.rollczi.litecommands.annotations.command.Command;
-import dev.rollczi.litecommands.annotations.context.Context;
+import dev.rollczi.litecommands.annotations.context.Sender;
 import dev.rollczi.litecommands.annotations.execute.Execute;
 import dev.rollczi.litecommands.annotations.permission.Permission;
 import io.papermc.lib.PaperLib;
@@ -29,7 +29,7 @@ public TeleportToRandomPlayerCommand(
 
     @Execute
     @DescriptionDocs(description = "Teleport to a player who hasn't been teleported to recently, ensuring fair distribution")
-    void execute(@Context Player player) {
+    void execute(@Sender Player player) {
         Player targetPlayer = this.randomPlayerService.findLeastRecentlyTeleportedPlayer(player);
 
         if (targetPlayer == null || !targetPlayer.isOnline()) {
@@ -57,7 +57,7 @@ void execute(@Context Player player) {
      */
     @Execute
     @DescriptionDocs(description = "Teleport to a player who is within specified Y range and hasn't been teleported to recently")
-    void executeWithYRange(@Context Player player, @Arg int minY, @Arg int maxY) {
+    void executeWithYRange(@Sender Player player, @Arg int minY, @Arg int maxY) {
         if (minY > maxY) {
             this.noticeService.create()
                 .player(player.getUniqueId())
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/TpaAcceptCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/TpaAcceptCommand.java
index afb952ff8..e098111ba 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/TpaAcceptCommand.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/TpaAcceptCommand.java
@@ -7,7 +7,7 @@
 import com.eternalcode.core.notice.NoticeService;
 import dev.rollczi.litecommands.annotations.argument.Arg;
 import dev.rollczi.litecommands.annotations.command.Command;
-import dev.rollczi.litecommands.annotations.context.Context;
+import dev.rollczi.litecommands.annotations.context.Sender;
 import dev.rollczi.litecommands.annotations.execute.Execute;
 import dev.rollczi.litecommands.annotations.permission.Permission;
 import java.util.List;
@@ -36,7 +36,7 @@ class TpaAcceptCommand {
 
     @Execute
     @DescriptionDocs(description = "Accept teleport request", arguments = "<player>")
-    void executeTarget(@Context Player player, @Arg(RequesterArgument.KEY) Player target) {
+    void executeTarget(@Sender Player player, @Arg(RequesterArgument.KEY) Player target) {
         this.teleportTaskService.createTeleport(
             target.getUniqueId(),
             PositionAdapter.convert(target.getLocation()),
@@ -63,7 +63,7 @@ void executeTarget(@Context Player player, @Arg(RequesterArgument.KEY) Player ta
 
     @Execute(name = "-all", aliases = "*")
     @DescriptionDocs(description = "Accept all teleport requests")
-    void executeAll(@Context Player player) {
+    void executeAll(@Sender Player player) {
         List<UUID> requests = this.requestService.findRequests(player.getUniqueId());
 
         if (requests.isEmpty()) {
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/TpaCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/TpaCommand.java
index 86f1c0dc6..13cc6730c 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/TpaCommand.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/TpaCommand.java
@@ -5,10 +5,10 @@
 import com.eternalcode.core.injector.annotations.Inject;
 import com.eternalcode.core.notice.NoticeService;
 import dev.rollczi.litecommands.annotations.argument.Arg;
-import dev.rollczi.litecommands.annotations.context.Context;
+import dev.rollczi.litecommands.annotations.command.Command;
+import dev.rollczi.litecommands.annotations.context.Sender;
 import dev.rollczi.litecommands.annotations.execute.Execute;
 import dev.rollczi.litecommands.annotations.permission.Permission;
-import dev.rollczi.litecommands.annotations.command.Command;
 import java.util.concurrent.CompletableFuture;
 import org.bukkit.entity.Player;
 
@@ -29,7 +29,7 @@ class TpaCommand {
 
     @Execute
     @DescriptionDocs(description = "Send teleport request to player", arguments = "<player>")
-    void execute(@Context Player player, @Arg Player target) {
+    void execute(@Sender Player player, @Arg Player target) {
         if (player.equals(target)) {
             this.noticeService.player(player.getUniqueId(), translation -> translation.tpa().tpaSelfMessage());
 
@@ -74,4 +74,3 @@ CompletableFuture<Boolean> isIgnoring(Player target, Player sender) {
         return this.ignoreService.isIgnored(target.getUniqueId(), sender.getUniqueId());
     }
 }
-
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/TpaDenyCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/TpaDenyCommand.java
index 33fbbe9f4..3704401e4 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/TpaDenyCommand.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/TpaDenyCommand.java
@@ -4,15 +4,14 @@
 import com.eternalcode.core.injector.annotations.Inject;
 import com.eternalcode.core.notice.NoticeService;
 import dev.rollczi.litecommands.annotations.argument.Arg;
-import dev.rollczi.litecommands.annotations.context.Context;
+import dev.rollczi.litecommands.annotations.command.Command;
+import dev.rollczi.litecommands.annotations.context.Sender;
 import dev.rollczi.litecommands.annotations.execute.Execute;
 import dev.rollczi.litecommands.annotations.permission.Permission;
-import dev.rollczi.litecommands.annotations.command.Command;
-import org.bukkit.Server;
-import org.bukkit.entity.Player;
-
 import java.util.List;
 import java.util.UUID;
+import org.bukkit.Server;
+import org.bukkit.entity.Player;
 
 @Command(name = "tpadeny", aliases = "tpdeny")
 @Permission("eternalcore.tpadeny")
@@ -31,7 +30,7 @@ class TpaDenyCommand {
 
     @Execute
     @DescriptionDocs(description = "Deny teleport request", arguments = "<player>")
-    void executeTarget(@Context Player player, @Arg(RequesterArgument.KEY) Player target) {
+    void executeTarget(@Sender Player player, @Arg(RequesterArgument.KEY) Player target) {
         this.requestService.removeRequest(target.getUniqueId());
 
         this.noticeService
@@ -51,7 +50,7 @@ void executeTarget(@Context Player player, @Arg(RequesterArgument.KEY) Player ta
 
     @Execute(name = "-all", aliases = "*")
     @DescriptionDocs(description = "Deny all teleport requests")
-    void executeAll(@Context Player player) {
+    void executeAll(@Sender Player player) {
         List<UUID> requests = this.requestService.findRequests(player.getUniqueId());
 
         if (requests.isEmpty()) {
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/self/TpaHereActionCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/self/TpaHereActionCommand.java
index 41e839700..77421d826 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/self/TpaHereActionCommand.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/teleportrequest/self/TpaHereActionCommand.java
@@ -8,7 +8,7 @@
 import com.eternalcode.core.notice.NoticeService;
 import dev.rollczi.litecommands.annotations.argument.Arg;
 import dev.rollczi.litecommands.annotations.command.RootCommand;
-import dev.rollczi.litecommands.annotations.context.Context;
+import dev.rollczi.litecommands.annotations.context.Sender;
 import dev.rollczi.litecommands.annotations.execute.Execute;
 import dev.rollczi.litecommands.annotations.permission.Permission;
 import java.util.List;
@@ -36,7 +36,7 @@ class TpaHereActionCommand {
 
     @Execute(name = "tpahereaccept")
     @Permission("eternalcore.tpaccept")
-    void accept(@Context Player player, @Arg(SelfRequesterArgument.KEY) Player target) {
+    void accept(@Sender Player player, @Arg(SelfRequesterArgument.KEY) Player target) {
         this.teleportTaskService.createTeleport(
             player.getUniqueId(),
             PositionAdapter.convert(player.getLocation()),
@@ -64,7 +64,7 @@ void accept(@Context Player player, @Arg(SelfRequesterArgument.KEY) Player targe
     @Execute(name = "tpaheredeny")
     @Permission("eternalcore.tpahere.deny")
     @DescriptionDocs(description = "Deny a teleport here request")
-    void executeTarget(@Context Player player, @Arg(SelfRequesterArgument.KEY) Player target) {
+    void executeTarget(@Sender Player player, @Arg(SelfRequesterArgument.KEY) Player target) {
         this.requestService.removeRequest(target.getUniqueId());
 
         this.noticeService
@@ -85,7 +85,7 @@ void executeTarget(@Context Player player, @Arg(SelfRequesterArgument.KEY) Playe
     @Execute(name = "tpaheredeny -all")
     @Permission("eternalcore.tpahere.deny")
     @DescriptionDocs(description = "Deny all teleport here requests")
-    void executeAll(@Context Player player) {
+    void executeAll(@Sender Player player) {
         List<UUID> requests = this.requestService.findRequests(player.getUniqueId());
 
         if (requests.isEmpty()) {
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/time/DayCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/time/DayCommand.java
index b127b87a4..62347142e 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/time/DayCommand.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/time/DayCommand.java
@@ -6,10 +6,11 @@
 import com.eternalcode.core.notice.NoticeService;
 import com.eternalcode.core.viewer.Viewer;
 import dev.rollczi.litecommands.annotations.argument.Arg;
+import dev.rollczi.litecommands.annotations.command.Command;
 import dev.rollczi.litecommands.annotations.context.Context;
+import dev.rollczi.litecommands.annotations.context.Sender;
 import dev.rollczi.litecommands.annotations.execute.Execute;
 import dev.rollczi.litecommands.annotations.permission.Permission;
-import dev.rollczi.litecommands.annotations.command.Command;
 import org.bukkit.World;
 
 @Command(name = "day")
@@ -27,13 +28,13 @@ class DayCommand {
 
     @Execute
     @DescriptionDocs(description = "Sets time to day in current world")
-    void day(@Context Viewer viewer, @Context World world) {
+    void day(@Sender Viewer viewer, @Context World world) {
         this.setDay(viewer, world);
     }
 
     @Execute
     @DescriptionDocs(description = "Sets time to day in specified world", arguments = "<world>")
-    void dayWorld(@Context Viewer viewer, @Arg World world) {
+    void dayWorld(@Sender Viewer viewer, @Arg World world) {
         this.setDay(viewer, world);
     }
 
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/time/NightCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/time/NightCommand.java
index 76f9425bd..8480ed1e9 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/time/NightCommand.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/time/NightCommand.java
@@ -6,10 +6,11 @@
 import com.eternalcode.core.notice.NoticeService;
 import com.eternalcode.core.viewer.Viewer;
 import dev.rollczi.litecommands.annotations.argument.Arg;
+import dev.rollczi.litecommands.annotations.command.Command;
 import dev.rollczi.litecommands.annotations.context.Context;
+import dev.rollczi.litecommands.annotations.context.Sender;
 import dev.rollczi.litecommands.annotations.execute.Execute;
 import dev.rollczi.litecommands.annotations.permission.Permission;
-import dev.rollczi.litecommands.annotations.command.Command;
 import org.bukkit.World;
 
 @Command(name = "night")
@@ -27,13 +28,13 @@ class NightCommand {
 
     @Execute
     @DescriptionDocs(description = "Sets time to night in current world")
-    void night(@Context Viewer viewer, @Context World world) {
+    void night(@Sender Viewer viewer, @Context World world) {
         this.setNight(viewer, world);
     }
 
     @Execute
     @DescriptionDocs(description = "Sets time to night in specified world", arguments = "<world>")
-    void nightWorld(@Context Viewer viewer, @Arg World world) {
+    void nightWorld(@Sender Viewer viewer, @Arg World world) {
         this.setNight(viewer, world);
     }
 
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/time/TimeCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/time/TimeCommand.java
index 17c9efe2b..4d160a576 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/time/TimeCommand.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/time/TimeCommand.java
@@ -7,7 +7,7 @@
 import com.eternalcode.core.viewer.Viewer;
 import dev.rollczi.litecommands.annotations.argument.Arg;
 import dev.rollczi.litecommands.annotations.command.Command;
-import dev.rollczi.litecommands.annotations.context.Context;
+import dev.rollczi.litecommands.annotations.context.Sender;
 import dev.rollczi.litecommands.annotations.execute.Execute;
 import dev.rollczi.litecommands.annotations.permission.Permission;
 import org.bukkit.World;
@@ -28,13 +28,13 @@ class TimeCommand {
 
     @Execute(name = "add")
     @DescriptionDocs(description = "Adds specified amount of time to specified world", arguments = "<time>")
-    void add(@Context Player player, @Context Viewer viewer, @Arg(TimeArgument.KEY) int time) {
+    void add(@Sender Player player, @Sender Viewer viewer, @Arg(TimeArgument.KEY) int time) {
         this.add(viewer, time, player.getWorld());
     }
 
     @Execute(name = "add")
     @DescriptionDocs(description = "Add specified amount of time to specified world", arguments = "<time> <world>")
-    void add(@Context Viewer viewer, @Arg(TimeArgument.KEY) int time, @Arg World world) {
+    void add(@Sender Viewer viewer, @Arg(TimeArgument.KEY) int time, @Arg World world) {
         this.scheduler.run(() -> world.setTime(world.getTime() + time));
 
         this.noticeService.create()
@@ -46,13 +46,13 @@ void add(@Context Viewer viewer, @Arg(TimeArgument.KEY) int time, @Arg World wor
 
     @Execute(name = "set")
     @DescriptionDocs(description = "Sets specified time", arguments = "<time>")
-    void set(@Context Player player, @Context Viewer viewer, @Arg(TimeArgument.KEY) int time) {
+    void set(@Sender Player player, @Sender Viewer viewer, @Arg(TimeArgument.KEY) int time) {
         this.set(viewer, time, player.getWorld());
     }
 
     @Execute(name = "set")
     @DescriptionDocs(description = "Sets specified time to specified world", arguments = "<time> <world>")
-    void set(@Context Viewer viewer, @Arg(TimeArgument.KEY) int time, @Arg World world) {
+    void set(@Sender Viewer viewer, @Arg(TimeArgument.KEY) int time, @Arg World world) {
         this.scheduler.run(() -> world.setTime(time));
 
         this.noticeService.create()
@@ -64,25 +64,25 @@ void set(@Context Viewer viewer, @Arg(TimeArgument.KEY) int time, @Arg World wor
 
     @Execute(name = "set day")
     @DescriptionDocs(description = "Sets time to day")
-    void setDay(@Context Player player, @Context Viewer viewer) {
+    void setDay(@Sender Player player, @Sender Viewer viewer) {
         this.set(viewer, 1000, player.getWorld());
     }
 
     @Execute(name = "set night")
     @DescriptionDocs(description = "Sets time to night")
-    void setNight(@Context Player player, @Context Viewer viewer) {
+    void setNight(@Sender Player player, @Sender Viewer viewer) {
         this.set(viewer, 13000, player.getWorld());
     }
 
     @Execute(name = "set noon")
     @DescriptionDocs(description = "Sets time to noon")
-    void setNoon(@Context Player player, @Context Viewer viewer) {
+    void setNoon(@Sender Player player, @Sender Viewer viewer) {
         this.set(viewer, 6000, player.getWorld());
     }
 
     @Execute(name = "set midnight")
     @DescriptionDocs(description = "Sets time to midnight")
-    void setMidnight(@Context Player player, @Context Viewer viewer) {
+    void setMidnight(@Sender Player player, @Sender Viewer viewer) {
         this.set(viewer, 18000, player.getWorld());
     }
 
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/vanish/VanishCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/vanish/VanishCommand.java
index fa874e18c..6e8bb5189 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/vanish/VanishCommand.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/vanish/VanishCommand.java
@@ -7,7 +7,7 @@
 import com.eternalcode.multification.notice.provider.NoticeProvider;
 import dev.rollczi.litecommands.annotations.argument.Arg;
 import dev.rollczi.litecommands.annotations.command.Command;
-import dev.rollczi.litecommands.annotations.context.Context;
+import dev.rollczi.litecommands.annotations.context.Sender;
 import dev.rollczi.litecommands.annotations.execute.Execute;
 import dev.rollczi.litecommands.annotations.permission.Permission;
 import org.bukkit.entity.Player;
@@ -27,7 +27,7 @@ public VanishCommand(NoticeService noticeService, VanishService vanishService) {
 
     @Execute
     @DescriptionDocs(description = "Toggle your vanish state")
-    void vanishSelf(@Context Player player) {
+    void vanishSelf(@Sender Player player) {
         boolean vanished = this.vanishService.toggleVanish(player);
         this.sendMessage(player, player, vanished ? VanishMessages::vanishEnabled : VanishMessages::vanishDisabled);
     }
@@ -35,7 +35,7 @@ void vanishSelf(@Context Player player) {
     @Execute
     @Permission(VanishPermissionConstant.VANISH_COMMAND_PERMISSION_OTHER)
     @DescriptionDocs(description = "Toggle vanish state for another player")
-    void vanishOther(@Context Player player, @Arg Player target) {
+    void vanishOther(@Sender Player player, @Arg Player target) {
         if (player.equals(target)) {
             this.vanishSelf(player);
             return;
@@ -55,4 +55,3 @@ private void sendMessage(Player sender, Player target, NoticeProvider<VanishMess
     }
 
 }
-
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/warp/command/DelWarpCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/warp/command/DelWarpCommand.java
index 0fb497a29..54aaf7e91 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/warp/command/DelWarpCommand.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/warp/command/DelWarpCommand.java
@@ -8,7 +8,7 @@
 import com.eternalcode.core.notice.NoticeService;
 import dev.rollczi.litecommands.annotations.argument.Arg;
 import dev.rollczi.litecommands.annotations.command.Command;
-import dev.rollczi.litecommands.annotations.context.Context;
+import dev.rollczi.litecommands.annotations.context.Sender;
 import dev.rollczi.litecommands.annotations.execute.Execute;
 import dev.rollczi.litecommands.annotations.permission.Permission;
 import org.bukkit.entity.Player;
@@ -30,7 +30,7 @@ class DelWarpCommand {
 
     @Execute
     @DescriptionDocs(description = "Remove warp", arguments = "<warp>")
-    void remove(@Context Player player, @Arg Warp warp) {
+    void remove(@Sender Player player, @Arg Warp warp) {
         String name = warp.getName();
 
         this.removeWarp(player, name);
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/warp/command/SetWarpCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/warp/command/SetWarpCommand.java
index cd7d34d1a..8698a24ca 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/warp/command/SetWarpCommand.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/warp/command/SetWarpCommand.java
@@ -9,7 +9,7 @@
 import com.eternalcode.core.notice.NoticeService;
 import dev.rollczi.litecommands.annotations.argument.Arg;
 import dev.rollczi.litecommands.annotations.command.Command;
-import dev.rollczi.litecommands.annotations.context.Context;
+import dev.rollczi.litecommands.annotations.context.Sender;
 import dev.rollczi.litecommands.annotations.execute.Execute;
 import dev.rollczi.litecommands.annotations.permission.Permission;
 import java.util.UUID;
@@ -41,7 +41,7 @@ class SetWarpCommand {
 
     @Execute
     @DescriptionDocs(description = "Create warp")
-    void add(@Context Player player, @Arg String warpName) {
+    void add(@Sender Player player, @Arg String warpName) {
         UUID uniqueId = player.getUniqueId();
 
         this.createWarp(player, warpName, uniqueId);
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/warp/command/WarpCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/warp/command/WarpCommand.java
index 75d4deb2b..18a21392a 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/warp/command/WarpCommand.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/warp/command/WarpCommand.java
@@ -11,7 +11,7 @@
 import com.eternalcode.core.notice.NoticeService;
 import dev.rollczi.litecommands.annotations.argument.Arg;
 import dev.rollczi.litecommands.annotations.command.RootCommand;
-import dev.rollczi.litecommands.annotations.context.Context;
+import dev.rollczi.litecommands.annotations.context.Sender;
 import dev.rollczi.litecommands.annotations.execute.Execute;
 import dev.rollczi.litecommands.annotations.permission.Permission;
 import java.util.List;
@@ -46,7 +46,7 @@ class WarpCommand {
 
     @Execute(name = "warp")
     @DescriptionDocs(description = "Open warp inventory, optionally you can disable this feature in config, if feature is disabled eternalcore will show all available warps")
-    void warp(@Context Player player) {
+    void warp(@Sender Player player) {
         if (!this.warpSettings.inventoryEnabled()) {
             List<String> list = this.warpService.getWarps().stream().map(Warp::getName).toList();
 
@@ -73,7 +73,7 @@ void warp(@Context Player player) {
 
     @Execute(name = "warp")
     @DescriptionDocs(description = "Teleport to warp", arguments = "<warp>")
-    void warp(@Context Player player, @Arg Warp warp) {
+    void warp(@Sender Player player, @Arg Warp warp) {
         if (!warp.hasPermissions(player)) {
             this.noticeService.create()
                 .player(player.getUniqueId())
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/warp/command/permission/WarpAddPermissionCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/warp/command/permission/WarpAddPermissionCommand.java
index 86ff4159c..b527b4cba 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/warp/command/permission/WarpAddPermissionCommand.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/warp/command/permission/WarpAddPermissionCommand.java
@@ -7,7 +7,7 @@
 import com.eternalcode.core.notice.NoticeService;
 import dev.rollczi.litecommands.annotations.argument.Arg;
 import dev.rollczi.litecommands.annotations.command.Command;
-import dev.rollczi.litecommands.annotations.context.Context;
+import dev.rollczi.litecommands.annotations.context.Sender;
 import dev.rollczi.litecommands.annotations.execute.Execute;
 import dev.rollczi.litecommands.annotations.permission.Permission;
 import java.util.Arrays;
@@ -32,7 +32,7 @@ public WarpAddPermissionCommand(PluginConfiguration config, WarpService warpServ
     }
 
     @Execute
-    void addPermission(@Context Player player, @Arg Warp warp, @Arg String... permissions) {
+    void addPermission(@Sender Player player, @Arg Warp warp, @Arg String... permissions) {
         UUID uniqueId = player.getUniqueId();
 
         if (permissions.length == 0) {
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/warp/command/permission/WarpRemovePermissionCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/warp/command/permission/WarpRemovePermissionCommand.java
index 3cddadb02..52ecd8d18 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/warp/command/permission/WarpRemovePermissionCommand.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/warp/command/permission/WarpRemovePermissionCommand.java
@@ -7,7 +7,7 @@
 import com.eternalcode.core.notice.NoticeService;
 import dev.rollczi.litecommands.annotations.argument.Arg;
 import dev.rollczi.litecommands.annotations.command.Command;
-import dev.rollczi.litecommands.annotations.context.Context;
+import dev.rollczi.litecommands.annotations.context.Sender;
 import dev.rollczi.litecommands.annotations.execute.Execute;
 import dev.rollczi.litecommands.annotations.permission.Permission;
 import org.bukkit.entity.Player;
@@ -27,7 +27,7 @@ public WarpRemovePermissionCommand(WarpService warpService, NoticeService notice
 
     @Execute
     void removePermission(
-        @Context Player player,
+        @Sender Player player,
         @Arg WarpPermissionEntry entry
     ) {
         Warp warp = entry.warp();
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/weather/RainCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/weather/RainCommand.java
index a87034d4a..288a7ac47 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/weather/RainCommand.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/weather/RainCommand.java
@@ -8,6 +8,7 @@
 import dev.rollczi.litecommands.annotations.argument.Arg;
 import dev.rollczi.litecommands.annotations.command.Command;
 import dev.rollczi.litecommands.annotations.context.Context;
+import dev.rollczi.litecommands.annotations.context.Sender;
 import dev.rollczi.litecommands.annotations.execute.Execute;
 import dev.rollczi.litecommands.annotations.permission.Permission;
 import org.bukkit.World;
@@ -27,13 +28,13 @@ class RainCommand {
 
     @Execute
     @DescriptionDocs(description = "Sets weather to rain in current world")
-    void rain(@Context Viewer viewer, @Context World world) {
+    void rain(@Sender Viewer viewer, @Context World world) {
         this.setRain(viewer, world);
     }
 
     @Execute
     @DescriptionDocs(description = "Sets weather to rain in specified world", arguments = "<world>")
-    void rainWorld(@Context Viewer viewer, @Arg World world) {
+    void rainWorld(@Sender Viewer viewer, @Arg World world) {
         this.setRain(viewer, world);
     }
 
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/weather/SunCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/weather/SunCommand.java
index 61c1f0f66..a49205367 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/weather/SunCommand.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/weather/SunCommand.java
@@ -8,6 +8,7 @@
 import dev.rollczi.litecommands.annotations.argument.Arg;
 import dev.rollczi.litecommands.annotations.command.Command;
 import dev.rollczi.litecommands.annotations.context.Context;
+import dev.rollczi.litecommands.annotations.context.Sender;
 import dev.rollczi.litecommands.annotations.execute.Execute;
 import dev.rollczi.litecommands.annotations.permission.Permission;
 import org.bukkit.World;
@@ -27,13 +28,13 @@ class SunCommand {
 
     @Execute
     @DescriptionDocs(description = "Sets weather to sun in current world")
-    void sun(@Context Viewer viewer, @Context World world) {
+    void sun(@Sender Viewer viewer, @Context World world) {
         this.setSun(viewer, world);
     }
 
     @Execute
     @DescriptionDocs(description = "Sets weather to sun in specified world", arguments = "<world>")
-    void sunWorld(@Context Viewer viewer, @Arg World world) {
+    void sunWorld(@Sender Viewer viewer, @Arg World world) {
         this.setSun(viewer, world);
     }
 
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/weather/ThunderCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/weather/ThunderCommand.java
index 9a36c94c2..31fc40c0c 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/weather/ThunderCommand.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/weather/ThunderCommand.java
@@ -8,6 +8,7 @@
 import dev.rollczi.litecommands.annotations.argument.Arg;
 import dev.rollczi.litecommands.annotations.command.Command;
 import dev.rollczi.litecommands.annotations.context.Context;
+import dev.rollczi.litecommands.annotations.context.Sender;
 import dev.rollczi.litecommands.annotations.execute.Execute;
 import dev.rollczi.litecommands.annotations.permission.Permission;
 import org.bukkit.World;
@@ -27,13 +28,13 @@ class ThunderCommand {
 
     @Execute
     @DescriptionDocs(description = "Sets weather to thunder in current world")
-    void thunder(@Context Viewer viewer, @Context World world) {
+    void thunder(@Sender Viewer viewer, @Context World world) {
         this.setThunder(viewer, world);
     }
 
     @Execute
     @DescriptionDocs(description = "Sets weather to thunder in specified world", arguments = "<world>")
-    void thunderWorld(@Context Viewer viewer, @Arg World world) {
+    void thunderWorld(@Sender Viewer viewer, @Arg World world) {
         this.setThunder(viewer, world);
     }