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..662033d8a 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
@@ -26,7 +26,7 @@ void executeSet(@Context Player player, @Arg("homeName") String homeName) {
     @Execute(name = "teleport")
     void executeTeleport(@Context Player player, @Arg("homeName") String homeName) {
         Location location = this.homeService.getHome(player.getUniqueId(), homeName)
-            .map(home -> home.getLocation())
+            .map(home -> home.getPosition())
             .orElse(null);
 
         if (location == null) {
diff --git a/eternalcore-api-example/src/main/java/com/eternalcode/example/feature/home/ApiHomeListener.java b/eternalcore-api-example/src/main/java/com/eternalcode/example/feature/home/ApiHomeListener.java
index 880629c5c..0b2905dcb 100644
--- a/eternalcore-api-example/src/main/java/com/eternalcode/example/feature/home/ApiHomeListener.java
+++ b/eternalcore-api-example/src/main/java/com/eternalcode/example/feature/home/ApiHomeListener.java
@@ -27,7 +27,7 @@ public ApiHomeListener(Server server) {
 
     @EventHandler
     void onHomeOverride(HomeOverrideEvent event) {
-        Location location = event.getLocation();
+        Location location = event.getPosition();
 
         String name = event.getHomeName();
         int blockX = location.getBlockX();
@@ -39,7 +39,7 @@ void onHomeOverride(HomeOverrideEvent event) {
 
     @EventHandler
     void onHomeCreate(HomeCreateEvent event) {
-        Location location = event.getLocation();
+        Location location = event.getPosition();
 
         String name = event.getHomeName();
         int blockX = location.getBlockX();
@@ -59,7 +59,7 @@ void onHomeCreateTroll(HomeCreateEvent event) {
         }
 
         if (player.hasPotionEffect(PotionEffectType.BAD_OMEN)) {
-            event.setLocation(player.getWorld().getSpawnLocation());
+            event.setPosition(player.getWorld().getSpawnLocation());
             event.setHomeName("bimbimbambam");
             System.out.println("Troll: Home location overridden to world spawn.");
         }
diff --git a/eternalcore-api/build.gradle.kts b/eternalcore-api/build.gradle.kts
index d174dbe4c..7951d15fb 100644
--- a/eternalcore-api/build.gradle.kts
+++ b/eternalcore-api/build.gradle.kts
@@ -6,5 +6,6 @@ plugins {
 
 dependencies {
     compileOnly("org.spigotmc:spigot-api:${Versions.SPIGOT_API}")
+    compileOnly("com.eternalcode:eternalcode-commons-bukkit:${Versions.ETERNALCODE_COMMONS}")
     api("org.jetbrains:annotations:${Versions.JETBRAINS_ANNOTATIONS}")
 }
diff --git a/eternalcore-api/src/main/java/com/eternalcode/core/feature/home/Home.java b/eternalcore-api/src/main/java/com/eternalcode/core/feature/home/Home.java
index 8b6b1cd23..a9c1cc9ff 100644
--- a/eternalcore-api/src/main/java/com/eternalcode/core/feature/home/Home.java
+++ b/eternalcore-api/src/main/java/com/eternalcode/core/feature/home/Home.java
@@ -1,11 +1,12 @@
 package com.eternalcode.core.feature.home;
 
+import com.eternalcode.commons.bukkit.position.Position;
+
 import java.util.UUID;
-import org.bukkit.Location;
 
 public interface Home {
 
-    Location getLocation();
+    Position getPosition();
 
     String getName();
 
diff --git a/eternalcore-api/src/main/java/com/eternalcode/core/feature/home/HomeService.java b/eternalcore-api/src/main/java/com/eternalcode/core/feature/home/HomeService.java
index 911b5b6fa..25f4428d9 100644
--- a/eternalcore-api/src/main/java/com/eternalcode/core/feature/home/HomeService.java
+++ b/eternalcore-api/src/main/java/com/eternalcode/core/feature/home/HomeService.java
@@ -4,6 +4,8 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.UUID;
+
+import com.eternalcode.commons.bukkit.position.Position;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.Nullable;
@@ -23,7 +25,7 @@ public interface HomeService {
     void deleteHome(UUID playerUniqueId, String name);
 
     @Nullable
-    Home createHome(UUID playerUniqueId, String name, Location location);
+    Home createHome(UUID playerUniqueId, String name, Position position);
 
     int getHomeLimit(Player player);
 }
diff --git a/eternalcore-api/src/main/java/com/eternalcode/core/feature/home/event/HomeCreateEvent.java b/eternalcore-api/src/main/java/com/eternalcode/core/feature/home/event/HomeCreateEvent.java
index b9d2e426f..6bb29b8ef 100644
--- a/eternalcore-api/src/main/java/com/eternalcode/core/feature/home/event/HomeCreateEvent.java
+++ b/eternalcore-api/src/main/java/com/eternalcode/core/feature/home/event/HomeCreateEvent.java
@@ -1,6 +1,8 @@
 package com.eternalcode.core.feature.home.event;
 
 import java.util.UUID;
+
+import com.eternalcode.commons.bukkit.position.Position;
 import org.bukkit.Location;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.Event;
@@ -16,15 +18,16 @@ public class HomeCreateEvent extends Event implements Cancellable {
     private final UUID playerUniqueId;
     private final UUID homeUniqueId;
     private String homeName;
-    private Location location;
+    private Position position;
     private boolean cancelled;
 
-    public HomeCreateEvent(UUID playerUniqueId, String homeName, UUID homeUniqueId, Location location) {
+    public HomeCreateEvent(UUID playerUniqueId, String homeName, UUID homeUniqueId, Position position) {
         super(false);
+
         this.playerUniqueId = playerUniqueId;
         this.homeName = homeName;
         this.homeUniqueId = homeUniqueId;
-        this.location = location;
+        this.position = position;
     }
 
     public UUID getHomeUniqueId() {
@@ -43,12 +46,12 @@ public UUID getPlayerUniqueId() {
         return this.playerUniqueId;
     }
 
-    public Location getLocation() {
-        return this.location;
+    public Position getPosition() {
+        return this.position;
     }
 
-    public void setLocation(Location location) {
-        this.location = location;
+    public void setPosition(Position position) {
+        this.position = position;
     }
 
     @Override
diff --git a/eternalcore-api/src/main/java/com/eternalcode/core/feature/home/event/HomeOverrideEvent.java b/eternalcore-api/src/main/java/com/eternalcode/core/feature/home/event/HomeOverrideEvent.java
index 8fd427321..6e7220aea 100644
--- a/eternalcore-api/src/main/java/com/eternalcode/core/feature/home/event/HomeOverrideEvent.java
+++ b/eternalcore-api/src/main/java/com/eternalcode/core/feature/home/event/HomeOverrideEvent.java
@@ -1,6 +1,7 @@
 package com.eternalcode.core.feature.home.event;
 
-import com.eternalcode.core.feature.home.Home;
+import com.eternalcode.commons.bukkit.position.Position;
+
 import java.util.UUID;
 import org.bukkit.Location;
 import org.bukkit.event.Cancellable;
@@ -17,16 +18,16 @@ public class HomeOverrideEvent extends Event implements Cancellable {
     private final UUID playerUniqueId;
     private final UUID homeUniqueId;
     private String homeName;
-    private Location location;
+    private Position position;
     private boolean cancelled;
 
-    public HomeOverrideEvent(UUID playerUniqueId, String homeName, UUID homeUniqueId, Location location) {
+    public HomeOverrideEvent(UUID playerUniqueId, String homeName, UUID homeUniqueId, Position position) {
         super(false);
 
         this.playerUniqueId = playerUniqueId;
         this.homeName = homeName;
         this.homeUniqueId = homeUniqueId;
-        this.location = location;
+        this.position = position;
     }
 
     public String getHomeName() {
@@ -45,12 +46,12 @@ public UUID getPlayerUniqueId() {
         return this.playerUniqueId;
     }
 
-    public void setLocation(Location location) {
-        this.location = location;
+    public void setPosition(Position position) {
+        this.position = position;
     }
 
-    public Location getLocation() {
-        return this.location;
+    public Position getPosition() {
+        return this.position;
     }
 
     @Override
diff --git a/eternalcore-api/src/main/java/com/eternalcode/core/feature/home/event/PreHomeTeleportEvent.java b/eternalcore-api/src/main/java/com/eternalcode/core/feature/home/event/PreHomeTeleportEvent.java
index b0ecc3d08..96be3709b 100644
--- a/eternalcore-api/src/main/java/com/eternalcode/core/feature/home/event/PreHomeTeleportEvent.java
+++ b/eternalcore-api/src/main/java/com/eternalcode/core/feature/home/event/PreHomeTeleportEvent.java
@@ -1,8 +1,8 @@
 package com.eternalcode.core.feature.home.event;
 
+import com.eternalcode.commons.bukkit.position.Position;
 import com.eternalcode.core.feature.home.Home;
 import java.util.UUID;
-import org.bukkit.Location;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
@@ -16,7 +16,7 @@ public class PreHomeTeleportEvent extends Event implements Cancellable {
 
     private final UUID playerUniqueId;
     private final Home home;
-    private Location location;
+    private Position position;
     private boolean cancelled;
 
     public PreHomeTeleportEvent(UUID playerUniqueId, Home home) {
@@ -24,19 +24,19 @@ public PreHomeTeleportEvent(UUID playerUniqueId, Home home) {
 
         this.playerUniqueId = playerUniqueId;
         this.home = home;
-        this.location = home.getLocation();
+        this.position = home.getPosition();
     }
 
     public Home getHome() {
         return this.home;
     }
 
-    public Location getLocation() {
-        return this.location;
+    public Position getPosition() {
+        return this.position;
     }
 
-    public void setLocation(Location location) {
-        this.location = location;
+    public void setPosition(Position position) {
+        this.position = position;
     }
 
 
diff --git a/eternalcore-api/src/main/java/com/eternalcode/core/feature/jail/JailedPlayer.java b/eternalcore-api/src/main/java/com/eternalcode/core/feature/jail/JailedPlayer.java
index 4a8d62a1b..e8a63c298 100644
--- a/eternalcore-api/src/main/java/com/eternalcode/core/feature/jail/JailedPlayer.java
+++ b/eternalcore-api/src/main/java/com/eternalcode/core/feature/jail/JailedPlayer.java
@@ -1,5 +1,7 @@
 package com.eternalcode.core.feature.jail;
 
+import com.eternalcode.commons.bukkit.position.Position;
+
 import java.time.Duration;
 import java.time.Instant;
 import java.util.UUID;
@@ -10,12 +12,14 @@ public class JailedPlayer {
     private final Instant detainedAt;
     private final Duration prisonTime;
     private final String detainedBy;
+    private final Position lastPosition;
 
-    public JailedPlayer(UUID player, Instant detainedAt, Duration prisonTime, String lockedUpBy) {
+    public JailedPlayer(UUID player, Instant detainedAt, Duration prisonTime, String detainedBy, Position lastPosition) {
         this.player = player;
         this.detainedAt = detainedAt;
         this.prisonTime = prisonTime;
-        this.detainedBy = lockedUpBy;
+        this.detainedBy = detainedBy;
+        this.lastPosition = lastPosition;
     }
     
     public UUID getPlayerUniqueId() {
@@ -34,6 +38,10 @@ public Duration getPrisonTime() {
         return this.prisonTime;
     }
 
+    public Position getLastPosition() {
+        return this.lastPosition;
+    }
+
     public boolean isPrisonExpired() {
         return this.detainedAt.plus(this.prisonTime).isBefore(Instant.now());
     }
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/configuration/migrations/Migration_0009_Rename_allowed_to_restricted_jail_commands.java b/eternalcore-core/src/main/java/com/eternalcode/core/configuration/migrations/Migration_0009_Rename_allowed_to_restricted_jail_commands.java
new file mode 100644
index 000000000..7b9a28a21
--- /dev/null
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/configuration/migrations/Migration_0009_Rename_allowed_to_restricted_jail_commands.java
@@ -0,0 +1,13 @@
+package com.eternalcode.core.configuration.migrations;
+
+import static eu.okaeri.configs.migrate.ConfigMigrationDsl.move;
+import eu.okaeri.configs.migrate.builtin.NamedMigration;
+
+class Migration_0009_Rename_allowed_to_restricted_jail_commands extends NamedMigration {
+
+    Migration_0009_Rename_allowed_to_restricted_jail_commands() {
+        super("Rename allowed to restricted jail commands",
+            move("jail.allowedCommands", "jail.restrictedCommands")
+        );
+    }
+}
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/configuration/migrations/Migration_0010_Rename_jail_section.java b/eternalcore-core/src/main/java/com/eternalcode/core/configuration/migrations/Migration_0010_Rename_jail_section.java
new file mode 100644
index 000000000..50f5e72ca
--- /dev/null
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/configuration/migrations/Migration_0010_Rename_jail_section.java
@@ -0,0 +1,37 @@
+package com.eternalcode.core.configuration.migrations;
+
+import static eu.okaeri.configs.migrate.ConfigMigrationDsl.move;
+
+import eu.okaeri.configs.migrate.builtin.NamedMigration;
+
+public class Migration_0010_Rename_jail_section extends NamedMigration {
+
+    Migration_0010_Rename_jail_section() {
+        super(
+            "Rename jail section",
+
+            move("jailSection.jailLocationSet", "jail.locationSet"),
+            move("jailSection.jailLocationRemove", "jail.locationRemove"),
+            move("jailSection.jailLocationNotSet", "jail.locationNotSet"),
+            move("jailSection.jailLocationOverride", "jail.locationOverride"),
+
+            move("jailSection.jailDetainBroadcast", "jail.detainBroadcast"),
+            move("jailSection.jailDetainPrivate", "jail.detained"),
+            move("jailSection.jailDetainCountdown", "jail.detainCountdown"),
+            move("jailSection.jailDetainOverride", "jail.detainOverride"),
+            move("jailSection.jailDetainAdmin", "jail.detainAdmin"),
+
+            move("jailSection.jailReleaseBroadcast", "jail.releaseBroadcast"),
+            move("jailSection.jailReleasePrivate", "jail.released"),
+            move("jailSection.jailReleaseAll", "jail.releaseAll"),
+            move("jailSection.jailReleaseNoPlayers", "jail.releaseNoPlayers"),
+            move("jailSection.jailIsNotPrisoner", "jail.isNotPrisoner"),
+
+            move("jailSection.jailListHeader", "jail.listHeader"),
+            move("jailSection.jailListEmpty", "jail.listEmpty"),
+            move("jailSection.jailListPlayerEntry", "jail.listPlayerEntry"),
+
+            move("jailSection.jailCannotUseCommand", "jail.cannotUseCommand")
+        );
+    }
+}
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/configuration/migrations/Migrations.java b/eternalcore-core/src/main/java/com/eternalcode/core/configuration/migrations/Migrations.java
index fc15363ae..b0c61da90 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/configuration/migrations/Migrations.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/configuration/migrations/Migrations.java
@@ -10,7 +10,9 @@ public class Migrations {
         new Migration_0003_Move_tprp_to_dedicated_section(),
         new Migration_0006_Move_alert_to_broadcast_section(),
         new Migration_0007_Move_clear_to_dedicated_section(),
-        new Migration_0008_Move_repair_to_dedicated_section()
+        new Migration_0008_Move_repair_to_dedicated_section(),
+        new Migration_0009_Rename_allowed_to_restricted_jail_commands(),
+        new Migration_0010_Rename_jail_section()
     };
 
 }
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/database/persister/PositionPersister.java b/eternalcore-core/src/main/java/com/eternalcode/core/database/persister/PositionPersister.java
new file mode 100644
index 000000000..f9239cd8b
--- /dev/null
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/database/persister/PositionPersister.java
@@ -0,0 +1,70 @@
+package com.eternalcode.core.database.persister;
+
+import com.eternalcode.commons.bukkit.position.Position;
+import com.eternalcode.commons.bukkit.position.PositionAdapter;
+import com.j256.ormlite.field.FieldType;
+import com.j256.ormlite.field.SqlType;
+import com.j256.ormlite.field.types.BaseDataType;
+import com.j256.ormlite.support.DatabaseResults;
+
+import java.sql.SQLException;
+
+public class PositionPersister extends BaseDataType {
+
+    private static final PositionPersister instance = new PositionPersister();
+
+    private PositionPersister() {
+        super(SqlType.LONG_STRING, new Class<?>[] {Position.class});
+    }
+
+    @Override
+    public Object javaToSqlArg(FieldType fieldType, Object javaObject) {
+        if (javaObject == null) {
+            return null;
+        }
+
+        if (!(javaObject instanceof Position position)) {
+            throw new IllegalArgumentException("Invalid object type: " + javaObject.getClass().getName());
+        }
+
+        return position.toString();
+    }
+
+    @Override
+    public Object resultToSqlArg(FieldType fieldType, DatabaseResults results, int columnPos) throws SQLException {
+        return results.getString(columnPos);
+    }
+
+    @Override
+    public Object parseDefaultString(FieldType fieldType, String defaultStr) {
+        return String.valueOf(defaultStr);
+    }
+
+    @Override
+    public Object sqlArgToJava(FieldType fieldType, Object sqlArg, int columnPos) {
+        String s = (String) sqlArg;
+
+        if (s == null) {
+            return null;
+        }
+
+        String[] params = s.split("/");
+
+        if (params.length != 6) {
+            throw new IllegalArgumentException("Invalid position format: " + s);
+        }
+
+        return new Position(
+            Double.parseDouble(params[1]),
+            Double.parseDouble(params[2]),
+            Double.parseDouble(params[3]),
+            Float.parseFloat(params[4]),
+            Float.parseFloat(params[5]),
+            params[0]
+        );
+    }
+
+    public static PositionPersister getSingleton() {
+        return instance;
+    }
+}
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/home/HomeImpl.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/home/HomeImpl.java
index 4d46f93bb..c17eac5cc 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/home/HomeImpl.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/home/HomeImpl.java
@@ -2,27 +2,28 @@
 
 import java.util.Objects;
 import java.util.UUID;
-import org.bukkit.Location;
+
+import com.eternalcode.commons.bukkit.position.Position;
 
 public class HomeImpl implements Home {
 
     private final UUID uuid;
     private final UUID owner;
     private final String name;
-    private final Location location;
+    private final Position position;
 
-    public HomeImpl(UUID uuid, UUID owner, String name, Location location) {
+    public HomeImpl(UUID uuid, UUID owner, String name, Position position) {
         this.uuid = uuid;
         this.owner = owner;
         this.name = name;
-        this.location = location;
+        this.position = position;
     }
 
-    public HomeImpl(UUID owner, String name, Location location) {
+    public HomeImpl(UUID owner, String name, Position position) {
         this.owner = owner;
         this.uuid = UUID.randomUUID();
         this.name = name;
-        this.location = location;
+        this.position = position;
     }
 
     @Override
@@ -41,8 +42,8 @@ public String getName() {
     }
 
     @Override
-    public Location getLocation() {
-        return this.location;
+    public Position getPosition() {
+        return this.position;
     }
 
     @Override
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/home/HomeManager.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/home/HomeManager.java
index 2909214dd..c033f2a88 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/home/HomeManager.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/home/HomeManager.java
@@ -1,5 +1,6 @@
 package com.eternalcode.core.feature.home;
 
+import com.eternalcode.commons.bukkit.position.Position;
 import com.eternalcode.core.event.EventCaller;
 import com.eternalcode.core.feature.home.database.HomeRepository;
 import com.eternalcode.core.feature.home.event.HomeCreateEvent;
@@ -46,33 +47,33 @@ private HomeManager(
     }
 
     @Override
-    public Home createHome(UUID playerUniqueId, String name, Location location) {
+    public Home createHome(UUID playerUniqueId, String name, Position position) {
         Map<String, Home> homes = this.userHomes.computeIfAbsent(playerUniqueId, k -> new HashMap<>());
 
         Home home = homes.get(name);
 
         if (home != null) {
-            HomeOverrideEvent event = this.eventCaller.callEvent(new HomeOverrideEvent(playerUniqueId, name, playerUniqueId, location));
+            HomeOverrideEvent event = this.eventCaller.callEvent(new HomeOverrideEvent(playerUniqueId, name, playerUniqueId, position));
 
             if (event.isCancelled()) {
                 return home;
             }
 
-            Home homeInEvent = new HomeImpl(playerUniqueId, event.getHomeName(), event.getLocation());
+            Home homeInEvent = new HomeImpl(playerUniqueId, event.getHomeName(), event.getPosition());
             homes.put(event.getHomeName(), homeInEvent);
             this.repository.deleteHome(playerUniqueId, name).thenAccept(completable -> this.repository.saveHome(homeInEvent));
 
             return homeInEvent;
         }
 
-        HomeCreateEvent event = new HomeCreateEvent(playerUniqueId, name, playerUniqueId, location);
+        HomeCreateEvent event = new HomeCreateEvent(playerUniqueId, name, playerUniqueId, position);
         this.eventCaller.callEvent(event);
 
         if (event.isCancelled()) {
             return null;
         }
 
-        Home homeInEvent = new HomeImpl(playerUniqueId, event.getHomeName(), event.getLocation());
+        Home homeInEvent = new HomeImpl(playerUniqueId, event.getHomeName(), event.getPosition());
         homes.put(event.getHomeName(), homeInEvent);
         this.repository.saveHome(homeInEvent);
 
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/home/HomePlaceholderSetup.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/home/HomePlaceholderSetup.java
index f4d695763..46e0963f5 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/home/HomePlaceholderSetup.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/home/HomePlaceholderSetup.java
@@ -32,7 +32,7 @@ void setUp(PlaceholderRegistry placeholderRegistry) {
             PlaceholderReplacer.of("homes_count", (text, targetPlayer) -> this.homesCount(targetPlayer)),
             PlaceholderReplacer.of("homes_limit", (text, targetPlayer) -> this.homesLimit(targetPlayer)),
             PlaceholderReplacer.of("homes_left", (text, targetPlayer) -> this.homesLeft(targetPlayer))
-        ).forEach(placeholder -> placeholderRegistry.registerPlaceholder(placeholder));
+        ).forEach(placeholderRegistry::registerPlaceholder);
     }
 
     private String homesLeft(Player targetPlayer) {
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/home/HomeTeleportService.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/home/HomeTeleportService.java
index d8aed23b6..70d1b780c 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/home/HomeTeleportService.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/home/HomeTeleportService.java
@@ -52,13 +52,13 @@ public void teleport(Player player, Home home) {
             ? Duration.ZERO
             : this.homesSettings.teleportTimeToHomes();
 
-        Position playerLocation = PositionAdapter.convert(player.getLocation());
-        Position homeLocation = PositionAdapter.convert(pre.getLocation());
+        Position playerPosition = PositionAdapter.convert(player.getLocation());
+        Position homeLocation = pre.getPosition();
 
         HomeTeleportEvent post = new HomeTeleportEvent(uniqueId, home);
         Teleport teleport = this.teleportTaskService.createTeleport(
             uniqueId,
-            playerLocation,
+            playerPosition,
             homeLocation,
             teleportTime
         );
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 0ea499913..30f6ef14f 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
@@ -1,6 +1,7 @@
 package com.eternalcode.core.feature.home.command;
 
 import com.eternalcode.annotations.scan.command.DescriptionDocs;
+import com.eternalcode.commons.bukkit.position.PositionAdapter;
 import com.eternalcode.core.event.EventCaller;
 import com.eternalcode.core.feature.home.HomeService;
 import com.eternalcode.core.feature.home.HomesSettings;
@@ -54,7 +55,7 @@ private void setOrOverrideHome(User user, Player player, String homeName) {
         UUID uniqueId = user.getUniqueId();
 
         if (this.homeService.hasHome(uniqueId, homeName)) {
-            this.homeService.createHome(uniqueId, homeName, player.getLocation());
+            this.homeService.createHome(uniqueId, homeName, PositionAdapter.convert(player.getLocation()));
 
             this.noticeService.create()
                 .user(user)
@@ -84,7 +85,7 @@ private void setOrOverrideHome(User user, Player player, String homeName) {
             return;
         }
 
-        this.homeService.createHome(uniqueId, homeName, player.getLocation());
+        this.homeService.createHome(uniqueId, homeName, PositionAdapter.convert(player.getLocation()));
         this.noticeService.create()
             .user(user)
             .notice(translation -> translation.home().create())
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/home/database/HomeTable.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/home/database/HomeTable.java
index fd8e913d0..48a6b936f 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/home/database/HomeTable.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/home/database/HomeTable.java
@@ -1,12 +1,12 @@
 package com.eternalcode.core.feature.home.database;
 
-import com.eternalcode.core.database.persister.LocationPersister;
+import com.eternalcode.commons.bukkit.position.Position;
+import com.eternalcode.core.database.persister.PositionPersister;
 import com.eternalcode.core.feature.home.HomeImpl;
 import com.eternalcode.core.feature.home.Home;
 import com.j256.ormlite.field.DatabaseField;
 import com.j256.ormlite.table.DatabaseTable;
 import java.util.UUID;
-import org.bukkit.Location;
 
 @DatabaseTable(tableName = "eternal_core_homes")
 class HomeTable {
@@ -20,24 +20,24 @@ class HomeTable {
     @DatabaseField(columnName = "name")
     private String name;
 
-    @DatabaseField(columnName = "location", persisterClass = LocationPersister.class)
-    private Location location;
+    @DatabaseField(columnName = "location", persisterClass = PositionPersister.class)
+    private Position position;
 
     HomeTable() {}
 
-    HomeTable(UUID uuid, UUID owner, String name, Location location) {
+    HomeTable(UUID uuid, UUID owner, String name, Position position) {
         this.uuid = uuid;
         this.owner = owner;
         this.name = name;
-        this.location = location;
+        this.position = position;
     }
 
     Home toHome() {
-        return new HomeImpl(this.uuid, this.owner, this.name, this.location);
+        return new HomeImpl(this.uuid, this.owner, this.name, this.position);
     }
 
     static HomeTable from(Home home) {
-        return new HomeTable(home.getUuid(), home.getOwner(), home.getName(), home.getLocation());
+        return new HomeTable(home.getUuid(), home.getOwner(), home.getName(), home.getPosition());
     }
 }
 
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..273ee684d 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
@@ -1,6 +1,8 @@
 package com.eternalcode.core.feature.home.homeadmin;
 
 import com.eternalcode.annotations.scan.command.DescriptionDocs;
+import com.eternalcode.commons.bukkit.position.Position;
+import com.eternalcode.commons.bukkit.position.PositionAdapter;
 import com.eternalcode.core.configuration.implementation.PluginConfiguration;
 import com.eternalcode.core.feature.home.Home;
 import com.eternalcode.core.feature.home.HomeManager;
@@ -40,9 +42,12 @@ public HomeAdminCommand(
     }
 
     @Execute(name = "sethome")
-    @DescriptionDocs(description = "Set home for user", arguments = "<user> <home> [location]")
+    @DescriptionDocs(description = "Set home for user", arguments = "<user> <home> [position]")
     void setHome(@Context Player sender, @Arg("player home") PlayerHomeEntry playerHomeEntry, @Arg Optional<Location> location) {
         Location optionalLocation = location.orElse(sender.getLocation());
+        optionalLocation.setWorld(sender.getWorld());
+        optionalLocation.setYaw(sender.getLocation().getYaw());
+        optionalLocation.setPitch(sender.getLocation().getPitch());
 
         Home home = playerHomeEntry.home();
         Player player = playerHomeEntry.player();
@@ -51,8 +56,10 @@ void setHome(@Context Player sender, @Arg("player home") PlayerHomeEntry playerH
         boolean hasHome = this.homeManager.hasHome(uniqueId, home);
         String name = home.getName();
 
+        Position position = PositionAdapter.convert(optionalLocation);
+
         if (hasHome) {
-            this.homeManager.createHome(uniqueId, name, optionalLocation);
+            this.homeManager.createHome(uniqueId, name, position);
             this.noticeService.create()
                 .notice(translate -> translate.home().overrideHomeLocationAsAdmin())
                 .placeholder("{HOME}", name)
@@ -63,7 +70,7 @@ void setHome(@Context Player sender, @Arg("player home") PlayerHomeEntry playerH
             return;
         }
 
-        this.homeManager.createHome(uniqueId, name, optionalLocation);
+        this.homeManager.createHome(uniqueId, name, position);
         this.noticeService.create()
             .notice(translate -> translate.home().createAsAdmin())
             .placeholder("{HOME}", name)
@@ -122,7 +129,8 @@ void home(@Context Player player, @Arg("player home") PlayerHomeEntry playerHome
             return;
         }
 
-        PaperLib.teleportAsync(player, homeOption.get().getLocation());
+        Location homeLocation = PositionAdapter.convert(homeOption.get().getPosition());
+        PaperLib.teleportAsync(player, homeLocation);
     }
 
     @Execute(name = "list")
@@ -140,7 +148,7 @@ void list(@Context Viewer viewer, @Arg User user) {
 
     private String formattedListUserHomes(UUID uniqueId) {
         return this.homeManager.getHomes(uniqueId).stream()
-            .map(home -> home.getName())
+            .map(Home::getName)
             .collect(Collectors.joining(this.pluginConfiguration.format.separator));
     }
 }
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..87069f1af 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
@@ -1,7 +1,6 @@
 package com.eternalcode.core.feature.jail;
 
 import com.eternalcode.annotations.scan.command.DescriptionDocs;
-import com.eternalcode.annotations.scan.permission.PermissionDocs;
 import com.eternalcode.core.injector.annotations.Inject;
 import com.eternalcode.core.notice.NoticeService;
 import com.eternalcode.core.util.DurationUtil;
@@ -11,21 +10,23 @@
 import dev.rollczi.litecommands.annotations.context.Context;
 import dev.rollczi.litecommands.annotations.execute.Execute;
 import dev.rollczi.litecommands.annotations.permission.Permission;
-import java.time.Duration;
 import org.bukkit.Location;
 import org.bukkit.Server;
 import org.bukkit.entity.Player;
 
+import java.time.Duration;
+
+import static com.eternalcode.core.feature.jail.JailPermissionConstant.JAIL_BYPASS_PERMISSION;
+import static com.eternalcode.core.feature.jail.JailPermissionConstant.JAIL_COMMAND_PERMISSION;
+import static com.eternalcode.core.feature.jail.JailPermissionConstant.JAIL_DETAIN_PERMISSION;
+import static com.eternalcode.core.feature.jail.JailPermissionConstant.JAIL_LIST_PERMISSION;
+import static com.eternalcode.core.feature.jail.JailPermissionConstant.JAIL_RELEASE_PERMISSION;
+import static com.eternalcode.core.feature.jail.JailPermissionConstant.JAIL_SETUP_PERMISSION;
+
 @Command(name = "jail")
-@PermissionDocs(
-    name = "Jail Bypass",
-    permission = JailCommand.JAIL_BYPASS,
-    description = "Permission allows to bypass jail punishment"
-)
+@Permission(JAIL_COMMAND_PERMISSION)
 class JailCommand {
 
-    static final String JAIL_BYPASS = "eternalcore.jail.bypass";
-
     private final JailService jailService;
     private final NoticeService noticeService;
     private final JailSettings jailSettings;
@@ -41,7 +42,7 @@ class JailCommand {
 
     @Async
     @Execute(name = "setup")
-    @Permission("eternalcore.jail.setup")
+    @Permission(JAIL_SETUP_PERMISSION)
     @DescriptionDocs(description = "Define jail spawn area")
     void executeJailSetup(@Context Player player) {
         Location location = player.getLocation();
@@ -51,15 +52,15 @@ void executeJailSetup(@Context Player player) {
 
         this.noticeService.create()
             .notice(translation -> (isLastJailSet
-                ? translation.jailSection().jailLocationOverride()
-                : translation.jailSection().jailLocationSet()))
+                ? translation.jail().locationOverride()
+                : translation.jail().locationSet()))
             .player(player.getUniqueId())
             .send();
     }
 
     @Async
     @Execute(name = "setup")
-    @Permission("eternalcore.jail.setup")
+    @Permission(JAIL_SETUP_PERMISSION)
     @DescriptionDocs(description = "Define jail spawn area", arguments = "<location>")
     void executeJailSetup(@Context Player player, @Arg Location location) {
         boolean isLastJailSet = this.jailService.getJailAreaLocation().isPresent();
@@ -69,15 +70,15 @@ void executeJailSetup(@Context Player player, @Arg Location location) {
 
         this.noticeService.create()
             .notice(translation -> (isLastJailSet
-                ? translation.jailSection().jailLocationOverride()
-                : translation.jailSection().jailLocationSet()))
+                ? translation.jail().locationOverride()
+                : translation.jail().locationSet()))
             .player(player.getUniqueId())
             .send();
     }
 
     @Async
     @Execute(name = "remove")
-    @Permission("eternalcore.jail.setup")
+    @Permission(JAIL_SETUP_PERMISSION)
     @DescriptionDocs(description = "Remove jail spawn area")
     void executeJailRemove(@Context Player player) {
         if (this.isPrisonAvailable(player)) {
@@ -87,36 +88,36 @@ void executeJailRemove(@Context Player player) {
         this.jailService.removeJailArea();
 
         this.noticeService.create()
-            .notice(translation -> translation.jailSection().jailLocationRemove())
+            .notice(translation -> translation.jail().locationRemoved())
             .player(player.getUniqueId())
             .send();
     }
 
     @Execute(name = "detain")
-    @Permission("eternalcore.jail.detain")
+    @Permission(JAIL_DETAIN_PERMISSION)
     @DescriptionDocs(description = "Detain self")
     void executeJailDetainSelf(@Context Player player) {
         this.executeJailDetainForTime(player, player, this.jailSettings.defaultJailDuration());
     }
 
     @Execute(name = "detain")
-    @Permission("eternalcore.jail.detain")
+    @Permission(JAIL_DETAIN_PERMISSION)
     @DescriptionDocs(description = "Detain a player", arguments = "<player>")
     void executeJailDetain(@Context Player player, @Arg Player target) {
         this.executeJailDetainForTime(player, target, this.jailSettings.defaultJailDuration());
     }
 
     @Execute(name = "detain")
-    @Permission("eternalcore.jail.detain")
+    @Permission(JAIL_DETAIN_PERMISSION)
     @DescriptionDocs(description = "Detain a player for some time", arguments = "<player> <time>")
     void executeJailDetainForTime(@Context Player player, @Arg Player target, @Arg Duration duration) {
         if (this.isPrisonAvailable(player)) {
             return;
         }
 
-        if (target.hasPermission(JAIL_BYPASS)) {
+        if (target.hasPermission(JAIL_BYPASS_PERMISSION)) {
             this.noticeService.create()
-                .notice(translation -> translation.jailSection().jailDetainAdmin())
+                .notice(translation -> translation.jail().detainAdmin())
                 .placeholder("{PLAYER}", target.getName())
                 .player(player.getUniqueId())
                 .send();
@@ -127,7 +128,7 @@ void executeJailDetainForTime(@Context Player player, @Arg Player target, @Arg D
 
         if (isPlayerJailed) {
             this.noticeService.create()
-                .notice(translation -> translation.jailSection().jailDetainOverride())
+                .notice(translation -> translation.jail().detainOverride())
                 .placeholder("{PLAYER}", target.getName())
                 .player(player.getUniqueId())
                 .send();
@@ -136,31 +137,31 @@ void executeJailDetainForTime(@Context Player player, @Arg Player target, @Arg D
         this.jailService.detainPlayer(target, player, duration);
 
         this.noticeService.create()
-            .notice(translation -> translation.jailSection().jailDetainBroadcast())
+            .notice(translation -> translation.jail().detainBroadcast())
             .placeholder("{PLAYER}", target.getName())
             .all()
             .send();
 
         this.noticeService.create()
-            .notice(translation -> translation.jailSection().jailDetainPrivate())
+            .notice(translation -> translation.jail().detained())
             .player(target.getUniqueId())
             .send();
     }
 
     @Execute(name = "release")
-    @Permission("eternalcore.jail.release")
+    @Permission(JAIL_RELEASE_PERMISSION)
     @DescriptionDocs(description = "Release self from jail")
     void executeJailReleaseSelf(@Context Player player) {
         this.executeJailRelease(player, player);
     }
 
     @Execute(name = "release")
-    @Permission("eternalcore.jail.release")
+    @Permission(JAIL_RELEASE_PERMISSION)
     @DescriptionDocs(description = "Release a player from jail", arguments = "<player>")
     void executeJailRelease(@Context Player player, @Arg Player target) {
         if (!this.jailService.isPlayerJailed(target.getUniqueId())) {
             this.noticeService.create()
-                .notice(translation -> translation.jailSection().jailIsNotPrisoner())
+                .notice(translation -> translation.jail().isNotPrisoner())
                 .placeholder("{PLAYER}", target.getName())
                 .player(player.getUniqueId())
                 .send();
@@ -170,24 +171,24 @@ void executeJailRelease(@Context Player player, @Arg Player target) {
         this.jailService.releasePlayer(target);
 
         this.noticeService.create()
-            .notice(translation -> translation.jailSection().jailReleasePrivate())
+            .notice(translation -> translation.jail().released())
             .player(target.getUniqueId())
             .send();
 
         this.noticeService.create()
-            .notice(translation -> translation.jailSection().jailReleaseBroadcast())
+            .notice(translation -> translation.jail().releaseBroadcast())
             .placeholder("{PLAYER}", target.getName())
             .all()
             .send();
     }
 
     @Execute(name = "release -all", aliases = { "release *" })
-    @Permission("eternalcore.jail.release")
+    @Permission(JAIL_RELEASE_PERMISSION)
     @DescriptionDocs(description = "Release all players from jail")
     void executeJailReleaseAll(@Context Player player) {
         if (this.jailService.getJailedPlayers().isEmpty()) {
             this.noticeService.create()
-                .notice(translation -> translation.jailSection().jailReleaseNoPlayers())
+                .notice(translation -> translation.jail().releaseNoPlayers())
                 .player(player.getUniqueId())
                 .send();
             return;
@@ -196,31 +197,31 @@ void executeJailReleaseAll(@Context Player player) {
         this.jailService.releaseAllPlayers();
 
         this.noticeService.create()
-            .notice(translation -> translation.jailSection().jailReleaseAll())
+            .notice(translation -> translation.jail().releaseAll())
             .all()
             .send();
     }
 
     @Execute(name = "list")
-    @Permission("eternalcore.jail.list")
+    @Permission(JAIL_LIST_PERMISSION)
     @DescriptionDocs(description = "List all jailed players")
     void executeJailList(@Context Player player) {
         if (this.jailService.getJailedPlayers().isEmpty()) {
             this.noticeService.create()
-                .notice(translation -> translation.jailSection().jailListEmpty())
+                .notice(translation -> translation.jail().listEmpty())
                 .player(player.getUniqueId())
                 .send();
             return;
         }
 
         this.noticeService.create()
-            .notice(translation -> translation.jailSection().jailListHeader())
+            .notice(translation -> translation.jail().listHeader())
             .player(player.getUniqueId())
             .send();
 
         for (JailedPlayer jailedPlayer : this.jailService.getJailedPlayers()) {
             this.noticeService.create()
-                .notice(translation -> translation.jailSection().jailListPlayerEntry())
+                .notice(translation -> translation.jail().listPlayerEntry())
                 .placeholder("{PLAYER}", this.server.getOfflinePlayer(jailedPlayer.getPlayerUniqueId()).getName())
                 .placeholder("{REMAINING_TIME}", DurationUtil.format(jailedPlayer.getRemainingTime(), true))
                 .placeholder("{DETAINED_BY}", jailedPlayer.getDetainedBy())
@@ -232,7 +233,7 @@ void executeJailList(@Context Player player) {
     private boolean isPrisonAvailable(Player player) {
         if (this.jailService.getJailAreaLocation().isEmpty()) {
             this.noticeService.create()
-                .notice(translation -> translation.jailSection().jailLocationNotSet())
+                .notice(translation -> translation.jail().locationNotSet())
                 .player(player.getUniqueId())
                 .send();
             return true;
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailCommandRestrictionType.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailCommandRestrictionType.java
new file mode 100644
index 000000000..68e1cec34
--- /dev/null
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailCommandRestrictionType.java
@@ -0,0 +1,6 @@
+package com.eternalcode.core.feature.jail;
+
+public enum JailCommandRestrictionType {
+    WHITELIST,
+    BLACKLIST
+}
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailConfig.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailConfig.java
index d32d0719a..6ea08e2db 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailConfig.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailConfig.java
@@ -14,6 +14,9 @@ public class JailConfig extends OkaeriConfig implements JailSettings {
     @Comment("# Default jail duration, set if no duration is specified")
     public Duration defaultJailDuration = Duration.ofMinutes(30);
 
-    @Comment("# Allowed commands in jail")
-    public Set<String> allowedCommands = Set.of("help", "msg", "r", "tell", "me", "helpop");
+    @Comment("# Command restriction type, either WHITELIST or BLACKLIST")
+    public JailCommandRestrictionType restrictionType = JailCommandRestrictionType.WHITELIST;
+
+    @Comment("# List of commands for restriction logic. Acts as a whitelist or blacklist depending on restrictionType.")
+    public Set<String> restrictedCommands = Set.of("help", "msg", "r", "tell", "me", "helpop");
 }
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailController.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailController.java
index 8116906b4..0834ff5d9 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailController.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailController.java
@@ -45,13 +45,20 @@ public void onPlayerPreCommand(PlayerCommandPreprocessEvent event) {
         }
 
         String command = event.getMessage().split(" ")[0].substring(1);
+        Set<String> restrictedCommands = this.jailSettings.restrictedCommands();
+        JailCommandRestrictionType restrictionType = this.jailSettings.restrictionType();
 
-        if (this.jailSettings.allowedCommands().contains(command)) {
+        boolean shouldBlockCommand = switch (restrictionType) {
+            case WHITELIST -> !restrictedCommands.contains(command);
+            case BLACKLIST -> restrictedCommands.contains(command);
+        };
+
+        if (!shouldBlockCommand) {
             return;
         }
 
         this.noticeService.create()
-            .notice(translation -> translation.jailSection().jailCannotUseCommand())
+            .notice(translation -> translation.jail().cannotUseCommand())
             .player(player.getUniqueId())
             .send();
 
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailPermissionConstant.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailPermissionConstant.java
new file mode 100644
index 000000000..807785469
--- /dev/null
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailPermissionConstant.java
@@ -0,0 +1,48 @@
+package com.eternalcode.core.feature.jail;
+
+import com.eternalcode.annotations.scan.permission.PermissionDocs;
+
+public class JailPermissionConstant {
+
+    @PermissionDocs(
+        name = "Jail Command",
+        permission = JailPermissionConstant .JAIL_COMMAND_PERMISSION,
+        description = "Permission allows to use jail commands."
+    )
+    public static final String JAIL_COMMAND_PERMISSION = "eternalcore.jail";
+
+    @PermissionDocs(
+        name = "Jail Bypass",
+        permission = JailPermissionConstant.JAIL_BYPASS_PERMISSION,
+        description = "Permission allows to bypass jail punishment."
+    )
+    public static final String JAIL_BYPASS_PERMISSION = "eternalcore.jail.bypass";
+
+    @PermissionDocs(
+        name = "Jail Detain",
+        permission = JailPermissionConstant.JAIL_DETAIN_PERMISSION,
+        description = "Allows to detain players in jail."
+    )
+    public static final String JAIL_DETAIN_PERMISSION = "eternalcore.jail.detain";
+
+    @PermissionDocs(
+        name = "Jail Release",
+        permission = JailPermissionConstant.JAIL_RELEASE_PERMISSION,
+        description = "Allows to release players from jail."
+    )
+    public static final String JAIL_RELEASE_PERMISSION = "eternalcore.jail.release";
+
+    @PermissionDocs(
+        name = "Jail List",
+        permission = JailPermissionConstant.JAIL_LIST_PERMISSION,
+        description = "Allows to list all jailed players."
+    )
+    public static final String JAIL_LIST_PERMISSION = "eternalcore.jail.list";
+
+    @PermissionDocs(
+        name = "Jail Setup",
+        permission = JailPermissionConstant.JAIL_SETUP_PERMISSION,
+        description = "Permission allows to setup jail area."
+    )
+    public static final String JAIL_SETUP_PERMISSION = "eternalcore.jail.setup";
+}
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailServiceImpl.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailServiceImpl.java
index a5a36155e..f25949672 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailServiceImpl.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailServiceImpl.java
@@ -16,7 +16,9 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Map;
+import java.util.Set;
 import java.util.UUID;
 import javax.annotation.Nullable;
 import org.bukkit.Location;
@@ -84,7 +86,15 @@ public boolean detainPlayer(Player player, CommandSender detainedBy, @Nullable D
             return false;
         }
 
-        JailedPlayer jailedPlayer = new JailedPlayer(player.getUniqueId(), Instant.now(), time, detainedBy.getName());
+        Position lastPosition = PositionAdapter.convert(player.getLocation());
+
+        JailedPlayer jailedPlayer = new JailedPlayer(
+            player.getUniqueId(),
+            Instant.now(),
+            time,
+            detainedBy.getName(),
+            lastPosition
+        );
 
         this.prisonerRepository.savePrisoner(jailedPlayer);
         this.jailedPlayers.put(player.getUniqueId(), jailedPlayer);
@@ -102,18 +112,27 @@ public boolean releasePlayer(Player player) {
             return false;
         }
 
+        JailedPlayer jailedPlayer = this.jailedPlayers.get(player.getUniqueId());
+
         this.prisonerRepository.deletePrisoner(player.getUniqueId());
         this.jailedPlayers.remove(player.getUniqueId());
 
-        this.spawnService.teleportToSpawn(player);
+        if (jailedPlayer != null && jailedPlayer.getLastPosition() != null) {
+            this.teleportService.teleport(player, PositionAdapter.convert(jailedPlayer.getLastPosition()));
+        } else {
+            this.spawnService.teleportToSpawn(player);
+        }
 
         return true;
     }
 
     @Override
     public void releaseAllPlayers() {
-        this.jailedPlayers.forEach((uuid, prisoner) -> {
-            Player jailedPlayer = this.server.getPlayer(uuid);
+        Set<UUID> playersToRelease = new HashSet<>();
+
+        this.jailedPlayers.forEach((uuid, jailedPlayer) -> {
+            Player player = this.server.getPlayer(uuid);
+
             JailReleaseEvent jailReleaseEvent = new JailReleaseEvent(uuid);
             this.eventCaller.callEvent(jailReleaseEvent);
 
@@ -121,24 +140,26 @@ public void releaseAllPlayers() {
                 return;
             }
 
-            if (jailedPlayer != null) {
-                this.teleportService.teleport(jailedPlayer, this.spawnService.getSpawnLocation());
+            playersToRelease.add(uuid);
+
+            if (player != null) {
+                this.teleportService.teleport(player, jailedPlayer.getLastPosition() != null
+                    ? PositionAdapter.convert(jailedPlayer.getLastPosition())
+                    : this.spawnService.getSpawnLocation());
             }
         });
 
-        this.jailedPlayers.clear();
-        this.prisonerRepository.deleteAllPrisoners();
+        playersToRelease.forEach(uuid -> {
+            this.jailedPlayers.remove(uuid);
+            this.prisonerRepository.deletePrisoner(uuid);
+        });
     }
 
     @Override
     public boolean isPlayerJailed(UUID player) {
         JailedPlayer jailedPlayer = this.jailedPlayers.get(player);
 
-        if (jailedPlayer == null || jailedPlayer.isPrisonExpired()) {
-            return false;
-        }
-
-        return true;
+        return jailedPlayer != null && !jailedPlayer.isPrisonExpired();
     }
 
     @Override
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailSettings.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailSettings.java
index 594b72d3c..00bb48cd8 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailSettings.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailSettings.java
@@ -1,13 +1,14 @@
 package com.eternalcode.core.feature.jail;
 
 import java.time.Duration;
-import java.util.List;
 import java.util.Set;
 
 public interface JailSettings {
 
     Duration defaultJailDuration();
 
-    Set<String> allowedCommands();
+    JailCommandRestrictionType restrictionType();
+
+    Set<String> restrictedCommands();
 
 }
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailTask.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailTask.java
index 31cf90428..ee49fb336 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailTask.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailTask.java
@@ -32,14 +32,14 @@ public void run() {
             }
 
             this.noticeService.create()
-                .notice(translation -> translation.jailSection().jailDetainCountdown())
+                .notice(translation -> translation.jail().detainCountdown())
                 .placeholder("{REMAINING_TIME}", DurationUtil.format(jailedPlayer.getRemainingTime(), true))
                 .player(jailedPlayer.getPlayerUniqueId())
                 .send();
 
             if (jailedPlayer.isPrisonExpired()) {
                 this.noticeService.create()
-                    .notice(translation -> translation.jailSection().jailReleasePrivate())
+                    .notice(translation -> translation.jail().released())
                     .player(jailedPlayer.getPlayerUniqueId())
                     .send();
 
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/PrisonerTable.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/PrisonerTable.java
index 05b587d1c..92d1ac9b1 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/PrisonerTable.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/PrisonerTable.java
@@ -1,5 +1,8 @@
 package com.eternalcode.core.feature.jail;
 
+import com.eternalcode.commons.bukkit.position.Position;
+import com.eternalcode.commons.bukkit.position.PositionAdapter;
+import com.eternalcode.core.database.persister.PositionPersister;
 import com.j256.ormlite.field.DataType;
 import com.j256.ormlite.field.DatabaseField;
 import com.j256.ormlite.table.DatabaseTable;
@@ -14,7 +17,6 @@ class PrisonerTable {
     @DatabaseField(columnName = "id", id = true)
     private UUID uuid;
 
-
     @DatabaseField(columnName = "detained_at", dataType = DataType.SERIALIZABLE)
     private Instant detainedAt;
 
@@ -24,18 +26,26 @@ class PrisonerTable {
     @DatabaseField(columnName = "detained_by")
     private String detainedBy;
 
+    @DatabaseField(
+        columnName = "last_position",
+        persisterClass = PositionPersister.class,
+        dataType = DataType.LONG_STRING
+    )
+    private Position lastPosition;
+
     PrisonerTable() {
     }
 
-    PrisonerTable(UUID uuid, Instant detainedAt, Duration duration, String detainedBy) {
+    PrisonerTable(UUID uuid, Instant detainedAt, Duration duration, String detainedBy, Position lastPosition) {
         this.uuid = uuid;
         this.detainedAt = detainedAt;
         this.duration = duration;
         this.detainedBy = detainedBy;
+        this.lastPosition = lastPosition;
     }
 
     JailedPlayer toPrisoner() {
-        return new JailedPlayer(this.uuid, this.detainedAt, this.duration, this.detainedBy);
+        return new JailedPlayer(this.uuid, this.detainedAt, this.duration, this.detainedBy, lastPosition);
     }
 
     static PrisonerTable from(JailedPlayer jailedPlayer) {
@@ -43,7 +53,8 @@ static PrisonerTable from(JailedPlayer jailedPlayer) {
             jailedPlayer.getPlayerUniqueId(),
             jailedPlayer.getDetainedAt(),
             jailedPlayer.getPrisonTime(),
-            jailedPlayer.getDetainedBy()
+            jailedPlayer.getDetainedBy(),
+            jailedPlayer.getLastPosition()
         );
     }
 }
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/messages/ENJailMessages.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/messages/ENJailMessages.java
index 946ec7309..77987ca3f 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/messages/ENJailMessages.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/messages/ENJailMessages.java
@@ -10,41 +10,41 @@
 @Accessors(fluent = true)
 public class ENJailMessages extends OkaeriConfig implements JailMessages {
     @Comment({" ", "# Section responsible for location of jail setup"})
-    public Notice jailLocationSet = Notice.chat("<green>► <white>Jail location has been set!");
-    public Notice jailLocationRemove = Notice.chat("<red>✘ <dark_red>Jail location has been removed!");
-    public Notice jailLocationNotSet = Notice.chat("<red>✘ <dark_red>Jail location is not set!");
-    public Notice jailLocationOverride = Notice.chat("<green>► <white>Jail location has been overridden!");
+    public Notice locationSet = Notice.chat("<green>► <white>Jail location has been set!");
+    public Notice locationRemoved = Notice.chat("<red>✘ <dark_red>Jail location has been removed!");
+    public Notice locationNotSet = Notice.chat("<red>✘ <dark_red>Jail location is not set!");
+    public Notice locationOverride = Notice.chat("<green>► <white>Jail location has been overridden!");
 
     @Comment({" ", "# Section responsible for detaining players"})
-    public Notice jailDetainPrivate = Notice.chat("<green>► <white>You have been jailed!");
-    public Notice jailCannotUseCommand = Notice.chat("<red>✘ <dark_red>You can't use this command! You are in jail!");
+    public Notice detained = Notice.chat("<green>► <white>You have been jailed!");
+    public Notice cannotUseCommand = Notice.chat("<red>✘ <dark_red>You can't use this command! You are in jail!");
     @Comment({" ", "# {PLAYER} - Player who has been detained"})
-    public Notice jailDetainOverride =
+    public Notice detainOverride =
         Notice.chat("<green>► <white>You have overridden the jail for <green>{PLAYER} <white>!");
     @Comment({" ", "# {PLAYER} - Player who has been detained"})
-    public Notice jailDetainBroadcast = Notice.chat("<green>► <white>Player <green>{PLAYER} <white>has been jailed!");
+    public Notice detainBroadcast = Notice.chat("<green>► <white>Player <green>{PLAYER} <white>has been jailed!");
     @Comment({" ", "# {REMAINING_TIME} - Time left to release"})
-    public Notice jailDetainCountdown =
+    public Notice detainCountdown =
         Notice.actionbar("<red> You are in jail! <gray>Time left: <red>{REMAINING_TIME}!");
     @Comment({" ", "# {PLAYER} - Admin who you can't detain"})
-    public Notice jailDetainAdmin =
+    public Notice detainAdmin =
         Notice.chat("<red>✘ <dark_red>You can't jail <red>{PLAYER} <dark_red>because he is an admin!");
 
     @Comment({" ", "# Section responsible for releasing players from jail"})
     @Comment({" ", "# {PLAYER} - Player who has been released from jail"})
-    public Notice jailReleaseBroadcast =
+    public Notice releaseBroadcast =
         Notice.chat("<green>► <white>Player <green>{PLAYER} <white>has been granted freedom!");
-    public Notice jailReleasePrivate = Notice.actionbar("<green> You have been released from jail!");
-    public Notice jailReleaseAll = Notice.chat("<green>► <white>All players have been released from jail!");
-    public Notice jailReleaseNoPlayers = Notice.chat("<red>✘ <dark_red>No players found in jail!");
+    public Notice released = Notice.actionbar("<green> You have been released from jail!");
+    public Notice releaseAll = Notice.chat("<green>► <white>All players have been released from jail!");
+    public Notice releaseNoPlayers = Notice.chat("<red>✘ <dark_red>No players found in jail!");
     @Comment({" ", "# {PLAYER} - Player nickname"})
-    public Notice jailIsNotPrisoner = Notice.chat("<red>✘ <dark_red>Player {PLAYER} is not a prisoner!");
+    public Notice isNotPrisoner = Notice.chat("<red>✘ <dark_red>Player {PLAYER} is not a prisoner!");
 
     @Comment({" ", "# Section responsible for listing players in jail"})
-    public Notice jailListHeader = Notice.chat("<green>► <white>Players in jail: ");
-    public Notice jailListEmpty = Notice.chat("<red>✘ <dark_red>No players found in jail!");
+    public Notice listHeader = Notice.chat("<green>► <white>Players in jail: ");
+    public Notice listEmpty = Notice.chat("<red>✘ <dark_red>No players found in jail!");
     @Comment({" ", "# {PLAYER} - Player who has been detained", "# {REMAINING_TIME} - Time of detention",
                   "# {DETAINED_BY} - Player who detained the player"})
-    public Notice jailListPlayerEntry = Notice.chat(
+    public Notice listPlayerEntry = Notice.chat(
         "<green>► <white>{PLAYER} <gray>(<white>{REMAINING_TIME}<gray>) <white>detained by <green>{DETAINED_BY} <white>!");
 }
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/messages/JailMessages.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/messages/JailMessages.java
index 992213a98..22f715d9a 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/messages/JailMessages.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/messages/JailMessages.java
@@ -3,26 +3,26 @@
 import com.eternalcode.multification.notice.Notice;
 
 public interface JailMessages {
-    Notice jailLocationSet();
-    Notice jailLocationRemove();
-    Notice jailLocationNotSet();
-    Notice jailLocationOverride();
+    Notice locationSet();
+    Notice locationRemoved();
+    Notice locationNotSet();
+    Notice locationOverride();
 
-    Notice jailDetainBroadcast();
-    Notice jailDetainPrivate();
-    Notice jailDetainCountdown();
-    Notice jailDetainOverride();
-    Notice jailDetainAdmin();
+    Notice detainBroadcast();
+    Notice detained();
+    Notice detainCountdown();
+    Notice detainOverride();
+    Notice detainAdmin();
 
-    Notice jailReleaseBroadcast();
-    Notice jailReleasePrivate();
-    Notice jailReleaseAll();
-    Notice jailReleaseNoPlayers();
-    Notice jailIsNotPrisoner();
+    Notice releaseBroadcast();
+    Notice released();
+    Notice releaseAll();
+    Notice releaseNoPlayers();
+    Notice isNotPrisoner();
 
-    Notice jailListHeader();
-    Notice jailListEmpty();
-    Notice jailListPlayerEntry();
+    Notice listHeader();
+    Notice listEmpty();
+    Notice listPlayerEntry();
 
-    Notice jailCannotUseCommand();
+    Notice cannotUseCommand();
 }
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/messages/PLJailMessages.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/messages/PLJailMessages.java
index fa2cd2112..8f66a4209 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/messages/PLJailMessages.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/messages/PLJailMessages.java
@@ -10,38 +10,38 @@
 @Accessors(fluent = true)
 public class PLJailMessages extends OkaeriConfig implements JailMessages {
     @Comment({" ", "# Sekcja odpowiedzialna za ustawianie lokalizacji jail'a"})
-    public Notice jailLocationSet = Notice.chat("<green>► <white>Ustawiono lokalizację jail'a!");
-    public Notice jailLocationRemove = Notice.chat("<red>✘ <dark_red>Usunięto lokalizację jail'a!");
-    public Notice jailLocationNotSet = Notice.chat("<red>✘ <dark_red>Lokalizacja jail'a nie została ustawiona!");
-    public Notice jailLocationOverride = Notice.chat("<green>► <white>Nadpisałeś lokalizację jail'a!");
+    public Notice locationSet = Notice.chat("<green>► <white>Ustawiono lokalizację jail'a!");
+    public Notice locationRemoved = Notice.chat("<red>✘ <dark_red>Usunięto lokalizację jail'a!");
+    public Notice locationNotSet = Notice.chat("<red>✘ <dark_red>Lokalizacja jail'a nie została ustawiona!");
+    public Notice locationOverride = Notice.chat("<green>► <white>Nadpisałeś lokalizację jail'a!");
 
     @Comment({" ", "# Sekcja odpowiedzialna za wiadomości dotyczące uwięzienia gracza"})
-    public Notice jailDetainPrivate = Notice.chat("<green>► <white>Zostałeś uwięziony!");
-    public Notice jailCannotUseCommand = Notice.chat("<red>✘ <dark_red>Nie możesz użyć tej komendy!");
+    public Notice detained = Notice.chat("<green>► <white>Zostałeś uwięziony!");
+    public Notice cannotUseCommand = Notice.chat("<red>✘ <dark_red>Nie możesz użyć tej komendy!");
     @Comment({" ", "# {PLAYER} - Gracz który został uwięziony"})
-    public Notice jailDetainBroadcast = Notice.chat("<green>► <white>Gracz <green>{PLAYER} <white>został uwięziony!");
+    public Notice detainBroadcast = Notice.chat("<green>► <white>Gracz <green>{PLAYER} <white>został uwięziony!");
     @Comment({" ", "# {PLAYER} - Gracz który został uwięziony"})
-    public Notice jailDetainOverride =
+    public Notice detainOverride =
         Notice.chat("<green>► <white>Napisałeś nadaną karę graczowi <green>{PLAYER}<white>!");
     @Comment({" ", "# {REMAINING_TIME} - Pozostały czas do uwolnienia"})
-    public Notice jailDetainCountdown = Notice.actionbar("<red>Pozostało <green>{REMAINING_TIME} <red>do uwolnienia!");
+    public Notice detainCountdown = Notice.actionbar("<red>Pozostało <green>{REMAINING_TIME} <red>do uwolnienia!");
     @Comment({" ", "# {PLAYER} - Administrator którego nie możesz uwięzić"})
-    public Notice jailDetainAdmin = Notice.chat("<red>✘ <dark_red>Nie możesz uwięzić administratora <red>{PLAYER}!");
+    public Notice detainAdmin = Notice.chat("<red>✘ <dark_red>Nie możesz uwięzić administratora <red>{PLAYER}!");
 
     @Comment({" ", "# Sekcja odpowiedzialna za wiadomości dotyczące uwolnienia gracza"})
     @Comment({" ", "# {PLAYER} - Gracz który został uwolniony"})
-    public Notice jailReleaseBroadcast = Notice.chat("<green>► <white>Gracz <green>{PLAYER} <white>został uwolniony!");
-    public Notice jailReleasePrivate = Notice.actionbar("<green>► <white>Zostałeś uwolniony!");
-    public Notice jailReleaseAll = Notice.chat("<green>► <white>Wszyscy gracze zostali uwolnieni!");
-    public Notice jailReleaseNoPlayers = Notice.chat("<red>✘ <dark_red>Nikt nie jest uwięziony!");
+    public Notice releaseBroadcast = Notice.chat("<green>► <white>Gracz <green>{PLAYER} <white>został uwolniony!");
+    public Notice released = Notice.actionbar("<green>► <white>Zostałeś uwolniony!");
+    public Notice releaseAll = Notice.chat("<green>► <white>Wszyscy gracze zostali uwolnieni!");
+    public Notice releaseNoPlayers = Notice.chat("<red>✘ <dark_red>Nikt nie jest uwięziony!");
     @Comment({" ", "# {PLAYER} - Nazwa gracza"})
-    public Notice jailIsNotPrisoner = Notice.chat("<red>✘ <dark_red>Gracz {PLAYER} nie jest uwięziony!");
+    public Notice isNotPrisoner = Notice.chat("<red>✘ <dark_red>Gracz {PLAYER} nie jest uwięziony!");
 
     @Comment({" ", "# Sekcja odpowiedzialna za wiadomości dotyczące listy graczy w jail'u"})
-    public Notice jailListHeader = Notice.chat("<green>► <white>Lista graczy w jail'u:");
-    public Notice jailListEmpty = Notice.chat("<red>✘ <dark_red>Nikt nie jest uwięziony!");
+    public Notice listHeader = Notice.chat("<green>► <white>Lista graczy w jail'u:");
+    public Notice listEmpty = Notice.chat("<red>✘ <dark_red>Nikt nie jest uwięziony!");
     @Comment({" ",
                   "# {PLAYER} - Gracz który jest uwięziony, {DETAINED_BY} - Gracz który uwięził gracza, {REMAINING_TIME} - Czas pozostały do uwolnienia"})
-    public Notice jailListPlayerEntry = Notice.chat(
+    public Notice listPlayerEntry = Notice.chat(
         "<green>► <white>Gracz <green>{PLAYER} <white>został uwięziony przez <green>{DETAINED_BY} <white>na czas <green>{REMAINING_TIME} <white>!");
 }
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/litecommand/LiteCommandsSetup.java b/eternalcore-core/src/main/java/com/eternalcode/core/litecommand/LiteCommandsSetup.java
index fd35d26ac..65a37d059 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/litecommand/LiteCommandsSetup.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/litecommand/LiteCommandsSetup.java
@@ -45,7 +45,7 @@ class LiteCommandsSetup {
                 .notice(translation -> translation.argument().incorrectLocation())
                 .placeholder("{LOCATION}", input)
             )
-            .extension(new LiteAdventurePlatformExtension<CommandSender>(audiencesProvider), extension -> extension
+            .extension(new LiteAdventurePlatformExtension<>(audiencesProvider), extension -> extension
                 .serializer(miniMessage)
             );
     }
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/litecommand/argument/GameModeArgument.java b/eternalcore-core/src/main/java/com/eternalcode/core/litecommand/argument/GameModeArgument.java
index cd86f5969..3d2397238 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/litecommand/argument/GameModeArgument.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/litecommand/argument/GameModeArgument.java
@@ -48,5 +48,4 @@ public SuggestionResult suggest(Invocation<CommandSender> invocation, Argument<G
             .stream()
             .collect(SuggestionResult.collector());
     }
-
 }
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/litecommand/argument/messages/PLArgumentMessages.java b/eternalcore-core/src/main/java/com/eternalcode/core/litecommand/argument/messages/PLArgumentMessages.java
index 0ce55371c..f2ac5e8f8 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/litecommand/argument/messages/PLArgumentMessages.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/litecommand/argument/messages/PLArgumentMessages.java
@@ -34,5 +34,4 @@ public class PLArgumentMessages extends OkaeriConfig implements ArgumentMessages
     public Notice worldDoesntExist = Notice.chat("<red>✘ <dark_red>Świat <dark_red>{WORLD} <red>nie istnieje!");
     public Notice incorrectNumberOfChunks = Notice.chat("<red>✘ <dark_red>Niepoprawna liczba chunków!");
     public Notice incorrectLocation = Notice.chat("<red>✘ <dark_red>Niepoprawna lokalizacja! <red>({LOCATION})");
-
 }
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/translation/Translation.java b/eternalcore-core/src/main/java/com/eternalcode/core/translation/Translation.java
index f4616860e..f32619e95 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/translation/Translation.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/translation/Translation.java
@@ -232,7 +232,7 @@ interface ItemSection {
     // auto message section
     AutoMessageMessages autoMessage();
     // jail section
-    JailMessages jailSection();
+    JailMessages jail();
     // burn section
     BurnMessages burn();
     // vanish section
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/translation/implementation/ENTranslation.java b/eternalcore-core/src/main/java/com/eternalcode/core/translation/implementation/ENTranslation.java
index d46c52640..163004929 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/translation/implementation/ENTranslation.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/translation/implementation/ENTranslation.java
@@ -5,7 +5,6 @@
 import com.eternalcode.core.feature.container.messages.ENContainerMessages;
 import com.eternalcode.core.feature.repair.messages.ENRepairMessages;
 import com.eternalcode.core.litecommand.argument.messages.ENArgumentMessages;
-import com.eternalcode.core.configuration.contextual.ConfigItem;
 import com.eternalcode.core.feature.adminchat.messages.ENAdminChatMessages;
 import com.eternalcode.core.feature.afk.messages.ENAfkMessages;
 import com.eternalcode.core.feature.automessage.messages.ENAutoMessageMessages;
@@ -525,7 +524,7 @@ public static class ENItemSection extends OkaeriConfig implements ItemSection {
     public ENAutoMessageMessages autoMessage = new ENAutoMessageMessages();
 
     @Comment({" ", "# This section is responsible for handling jail-related stuff."})
-    public ENJailMessages jailSection = new ENJailMessages();
+    public ENJailMessages jail = new ENJailMessages();
 
     @Comment({" ", "# This section is responsible for elder guardian messages."})
     public ENElderGuardianMessages elderGuardian = new ENElderGuardianMessages();
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/translation/implementation/PLTranslation.java b/eternalcore-core/src/main/java/com/eternalcode/core/translation/implementation/PLTranslation.java
index e06118b27..a6fb48169 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/translation/implementation/PLTranslation.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/translation/implementation/PLTranslation.java
@@ -6,7 +6,6 @@
 import com.eternalcode.core.feature.container.messages.PLContainerMessages;
 import com.eternalcode.core.feature.repair.messages.PLRepairMessages;
 import com.eternalcode.core.litecommand.argument.messages.PLArgumentMessages;
-import com.eternalcode.core.configuration.contextual.ConfigItem;
 import com.eternalcode.core.feature.adminchat.messages.PLAdminChatMessages;
 import com.eternalcode.core.feature.afk.messages.PLAfkMessages;
 import com.eternalcode.core.feature.automessage.messages.PLAutoMessageMessages;
@@ -22,7 +21,6 @@
 import com.eternalcode.core.translation.Language;
 import com.eternalcode.core.feature.motd.messages.PLMotdMessages;
 import com.eternalcode.core.feature.msg.messages.PLMsgMessages;
-import com.eternalcode.core.feature.near.messages.NearMessages;
 import com.eternalcode.core.feature.randomteleport.messages.PLRandomTeleportMessages;
 import com.eternalcode.core.feature.seen.messages.PLSeenMessages;
 import com.eternalcode.core.feature.setslot.messages.PLSetSlotMessages;
@@ -40,7 +38,6 @@
 import eu.okaeri.configs.annotation.Comment;
 import lombok.Getter;
 import lombok.experimental.Accessors;
-import org.bukkit.Material;
 import org.bukkit.event.entity.EntityDamageEvent;
 
 import java.io.File;
@@ -555,7 +552,7 @@ public static class PLItemSection extends OkaeriConfig implements ItemSection {
     public PLAutoMessageMessages autoMessage = new PLAutoMessageMessages();
 
     @Comment({" ", "# Ta sekcja odpowiada za wiadomości dotyczące jail'a"})
-    public PLJailMessages jailSection = new PLJailMessages();
+    public PLJailMessages jail = new PLJailMessages();
 
     @Comment({" ", "# Ta sekcja odpowiada za wiadomości dotyczące Elder Guardian'a"})
     public PLElderGuardianMessages elderGuardian = new PLElderGuardianMessages();