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..7714313b0 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,48 +1,58 @@
 package com.eternalcode.core.feature.jail;
 
+import org.bukkit.Location;
+
 import java.time.Duration;
 import java.time.Instant;
 import java.util.UUID;
 
-public class JailedPlayer {
-
-    private final UUID player;
-    private final Instant detainedAt;
-    private final Duration prisonTime;
-    private final String detainedBy;
-
-    public JailedPlayer(UUID player, Instant detainedAt, Duration prisonTime, String lockedUpBy) {
-        this.player = player;
-        this.detainedAt = detainedAt;
-        this.prisonTime = prisonTime;
-        this.detainedBy = lockedUpBy;
-    }
-    
-    public UUID getPlayerUniqueId() {
-        return this.player;
-    }
-
-    public Instant getDetainedAt() {
-        return this.detainedAt;
-    }
-
-    public String getDetainedBy() {
-        return this.detainedBy;
-    }
-
-    public Duration getPrisonTime() {
-        return this.prisonTime;
-    }
-
-    public boolean isPrisonExpired() {
-        return this.detainedAt.plus(this.prisonTime).isBefore(Instant.now());
-    }
-
-    public Instant getReleaseTime() {
-        return Instant.now().plus(this.prisonTime);
-    }
-
-    public Duration getRemainingTime() {
-        return Duration.between(Instant.now(), this.detainedAt.plus(this.prisonTime));
-    }
+public interface JailedPlayer {
+
+    /**
+     * Gets the player's UUID.
+     * @return player's UUID.
+     */
+    UUID playerUniqueId();
+
+    /**
+     * Gets the time when the player was detained.
+     * @return time when the player was detained.
+     */
+    Instant detainedAt();
+
+    /**
+     * Gets the name of the player who detained the player.
+     * @return name of player.
+     */
+    String detainedBy();
+
+    /**
+     * Gets the time the player is jailed.
+     * @return time the player is jailed.
+     */
+    Duration prisonTime();
+
+    /**
+     * Gets the jail position where the player is teleported when detained.
+     * @return last location of player.
+     */
+    Location lastLocation();
+
+    /**
+     * Checks if the jail has expired.
+     * @return true if the jail has expired, false otherwise.
+     */
+    boolean isPrisonExpired();
+
+    /**
+     * Gets the time when the player was released.
+     * @return time when the player was released.
+     */
+    Instant releaseTime();
+
+    /**
+     * Gets the remaining time of the jail.
+     * @return remaining time of the jail.
+     */
+    Duration remainingTime();
 }
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/configuration/migrations/Migration_0033_Rename_jail_section.java b/eternalcore-core/src/main/java/com/eternalcode/core/configuration/migrations/Migration_0033_Rename_jail_section.java
new file mode 100644
index 000000000..680ecb967
--- /dev/null
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/configuration/migrations/Migration_0033_Rename_jail_section.java
@@ -0,0 +1,38 @@
+package com.eternalcode.core.configuration.migrations;
+
+import static eu.okaeri.configs.migrate.ConfigMigrationDsl.move;
+
+import eu.okaeri.configs.migrate.builtin.NamedMigration;
+
+public class Migration_0033_Rename_jail_section extends NamedMigration {
+
+    Migration_0033_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"),
+            move("jailSection.allowedCommands", "jail.restrictedCommands")
+        );
+    }
+}
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 bb1e22b1d..5241789df 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
@@ -20,5 +20,7 @@ public class Migrations {
         new Migration_0015_Move_ignore_messages_to_dedicated_section(),
         new Migration_0031_Move_death_messages_to_dedicated_section(),
         new Migration_0032_Move_join_quit_messages_to_dedicated_section(),
-        };
+        new Migration_0033_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/database/HomeTable.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/home/database/HomeTable.java
index fd8e913d0..e2c4a343d 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
@@ -40,4 +40,3 @@ static HomeTable from(Home home) {
         return new HomeTable(home.getUuid(), home.getOwner(), home.getName(), home.getLocation());
     }
 }
-
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 60fd23b01..e667f914e 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
@@ -144,4 +144,3 @@ private String formattedListUserHomes(UUID uniqueId) {
             .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 c46e24605..63eb0ac27 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,13 @@
 package com.eternalcode.core.feature.jail;
 
+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;
+
 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;
@@ -17,15 +23,9 @@
 import org.bukkit.entity.Player;
 
 @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 +41,7 @@ class JailCommand {
 
     @Async
     @Execute(name = "setup")
-    @Permission("eternalcore.jail.setup")
+    @Permission(JAIL_SETUP_PERMISSION)
     @DescriptionDocs(description = "Define jail spawn area")
     void executeJailSetup(@Sender Player player) {
         Location location = player.getLocation();
@@ -51,15 +51,15 @@ void executeJailSetup(@Sender 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(@Sender Player player, @Arg Location location) {
         boolean isLastJailSet = this.jailService.getJailAreaLocation().isPresent();
@@ -69,54 +69,54 @@ void executeJailSetup(@Sender 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(@Sender Player player) {
-        if (this.isPrisonAvailable(player)) {
+        if (this.handleMissingJailLocation(player)) {
             return;
         }
 
         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(@Sender 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(@Sender 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(@Sender Player player, @Arg Player target, @Arg Duration duration) {
-        if (this.isPrisonAvailable(player)) {
+        if (this.handleMissingJailLocation(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 +127,7 @@ void executeJailDetainForTime(@Sender Player player, @Arg Player target, @Arg Du
 
         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 +136,31 @@ void executeJailDetainForTime(@Sender Player player, @Arg Player target, @Arg Du
         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(@Sender 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(@Sender 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 +170,24 @@ void executeJailRelease(@Sender 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")
+    @Execute(name = "release -all", aliases = {"release *"})
+    @Permission(JAIL_RELEASE_PERMISSION)
     @DescriptionDocs(description = "Release all players from jail")
     void executeJailReleaseAll(@Sender 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,43 +196,43 @@ void executeJailReleaseAll(@Sender 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(@Sender 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())
-                .placeholder("{PLAYER}", this.server.getOfflinePlayer(jailedPlayer.getPlayerUniqueId()).getName())
-                .placeholder("{REMAINING_TIME}", DurationUtil.format(jailedPlayer.getRemainingTime(), true))
-                .placeholder("{DETAINED_BY}", jailedPlayer.getDetainedBy())
+                .notice(translation -> translation.jail().listPlayerEntry())
+                .placeholder("{PLAYER}", this.server.getOfflinePlayer(jailedPlayer.playerUniqueId()).getName())
+                .placeholder("{REMAINING_TIME}", DurationUtil.format(jailedPlayer.remainingTime(), true))
+                .placeholder("{DETAINED_BY}", jailedPlayer.detainedBy())
                 .player(player.getUniqueId())
                 .send();
         }
     }
 
-    private boolean isPrisonAvailable(Player player) {
+    private boolean handleMissingJailLocation(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..56b69db88 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
@@ -1,5 +1,7 @@
 package com.eternalcode.core.feature.jail;
 
+import static com.eternalcode.core.feature.jail.JailPermissionConstant.JAIL_BYPASS_PERMISSION;
+
 import com.eternalcode.core.injector.annotations.Inject;
 import com.eternalcode.core.injector.annotations.component.Controller;
 import com.eternalcode.core.notice.NoticeService;
@@ -40,18 +42,25 @@ public void onPlayerPreCommand(PlayerCommandPreprocessEvent event) {
             return;
         }
 
-        if (player.hasPermission("eternalcore.jail.bypass")) {
+        if (player.hasPermission(JAIL_BYPASS_PERMISSION)) {
             return;
         }
 
         String command = event.getMessage().split(" ")[0].substring(1);
+        Set<String> restrictedCommands = this.jailSettings.restrictedCommands();
+        JailCommandRestrictionType restrictionType = this.jailSettings.restrictionType();
+
+        boolean shouldBlockCommand = switch (restrictionType) {
+            case WHITELIST -> !restrictedCommands.contains(command);
+            case BLACKLIST -> restrictedCommands.contains(command);
+        };
 
-        if (this.jailSettings.allowedCommands().contains(command)) {
+        if (!shouldBlockCommand) {
             return;
         }
 
         this.noticeService.create()
-            .notice(translation -> translation.jailSection().jailCannotUseCommand())
+            .notice(translation -> translation.jail().cannotUseCommand())
             .player(player.getUniqueId())
             .send();
 
@@ -70,5 +79,4 @@ public void onTeleport(PlayerTeleportEvent teleportEvent) {
             teleportEvent.setCancelled(true);
         }
     }
-
 }
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..97609fb14
--- /dev/null
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailPermissionConstant.java
@@ -0,0 +1,20 @@
+package com.eternalcode.core.feature.jail;
+
+import com.eternalcode.annotations.scan.permission.PermissionDocs;
+
+public class JailPermissionConstant {
+
+    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";
+
+    public static final String JAIL_DETAIN_PERMISSION = "eternalcore.jail.detain";
+    public static final String JAIL_RELEASE_PERMISSION = "eternalcore.jail.release";
+    public static final String JAIL_LIST_PERMISSION = "eternalcore.jail.list";
+    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..25bf69d9d 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,17 +16,17 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
 import java.util.UUID;
-import javax.annotation.Nullable;
 import org.bukkit.Location;
 import org.bukkit.Server;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.Blocking;
 
-import java.util.Optional;
-
 @Service
 class JailServiceImpl implements JailService {
 
@@ -34,10 +34,8 @@ class JailServiceImpl implements JailService {
 
     private final TeleportService teleportService;
     private final SpawnService spawnService;
-    private final JailSettings settings;
     private final EventCaller eventCaller;
     private final Server server;
-
     private final PrisonerRepository prisonerRepository;
     private final LocationsConfiguration locationsConfiguration;
     private final ConfigurationManager configurationManager;
@@ -46,7 +44,6 @@ class JailServiceImpl implements JailService {
     JailServiceImpl(
         TeleportService teleportService,
         SpawnService spawnService,
-        JailSettings settings,
         EventCaller eventCaller,
         Server server,
         PrisonerRepository prisonerRepository,
@@ -55,7 +52,6 @@ class JailServiceImpl implements JailService {
     ) {
         this.teleportService = teleportService;
         this.spawnService = spawnService;
-        this.settings = settings;
         this.eventCaller = eventCaller;
         this.server = server;
         this.prisonerRepository = prisonerRepository;
@@ -66,9 +62,15 @@ class JailServiceImpl implements JailService {
     }
 
     @Override
-    public boolean detainPlayer(Player player, CommandSender detainedBy, @Nullable Duration time) {
-        if (time == null) {
-            time = this.settings.defaultJailDuration();
+    public boolean detainPlayer(Player player, CommandSender detainedBy, Duration time) {
+        if (player == null) {
+            throw new IllegalArgumentException("Player cannot be null");
+        }
+        if (detainedBy == null) {
+            throw new IllegalArgumentException("Detained by cannot be null");
+        }
+        if (time == null || time.isNegative() || time.isZero()) {
+            throw new IllegalArgumentException("Duration must be positive and non-zero");
         }
 
         Optional<Location> jailAreaLocation = this.getJailAreaLocation();
@@ -84,7 +86,13 @@ public boolean detainPlayer(Player player, CommandSender detainedBy, @Nullable D
             return false;
         }
 
-        JailedPlayer jailedPlayer = new JailedPlayer(player.getUniqueId(), Instant.now(), time, detainedBy.getName());
+        JailedPlayer jailedPlayer = new JailedPlayerImpl(
+            player.getUniqueId(),
+            Instant.now(),
+            time,
+            detainedBy.getName(),
+            player.getLocation()
+        );
 
         this.prisonerRepository.savePrisoner(jailedPlayer);
         this.jailedPlayers.put(player.getUniqueId(), jailedPlayer);
@@ -95,6 +103,10 @@ public boolean detainPlayer(Player player, CommandSender detainedBy, @Nullable D
 
     @Override
     public boolean releasePlayer(Player player) {
+        if (player == null) {
+            throw new IllegalArgumentException("Player cannot be null");
+        }
+
         JailReleaseEvent jailReleaseEvent = new JailReleaseEvent(player.getUniqueId());
         this.eventCaller.callEvent(jailReleaseEvent);
 
@@ -102,18 +114,28 @@ 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.lastLocation() != null) {
+            this.teleportService.teleport(player, jailedPlayer.lastLocation());
+        }
+        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 +143,31 @@ 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.lastLocation() != null
+                        ? jailedPlayer.lastLocation()
+                        : 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;
+        if (player == null) {
+            throw new IllegalArgumentException("Player UUID cannot be null");
         }
 
-        return true;
+        JailedPlayer jailedPlayer = this.jailedPlayers.get(player);
+
+        return jailedPlayer != null && !jailedPlayer.isPrisonExpired();
     }
 
     @Override
@@ -149,7 +178,7 @@ public Collection<JailedPlayer> getJailedPlayers() {
     private void loadFromDatabase() {
         this.prisonerRepository.getPrisoners().thenAccept(prisoners -> {
             for (JailedPlayer jailedPlayer : prisoners) {
-                this.jailedPlayers.put(jailedPlayer.getPlayerUniqueId(), jailedPlayer);
+                this.jailedPlayers.put(jailedPlayer.playerUniqueId(), jailedPlayer);
             }
         });
     }
@@ -158,7 +187,7 @@ private void loadFromDatabase() {
     public Optional<Location> getJailAreaLocation() {
         Position position = this.locationsConfiguration.jail;
 
-        if (position.isNoneWorld()) {
+        if (position == null || position.isNoneWorld()) {
             return Optional.empty();
         }
 
@@ -168,6 +197,10 @@ public Optional<Location> getJailAreaLocation() {
     @Override
     @Blocking
     public void setupJailArea(Location jailLocation) {
+        if (jailLocation == null) {
+            throw new IllegalArgumentException("Jail location cannot be null");
+        }
+
         this.locationsConfiguration.jail = PositionAdapter.convert(jailLocation);
         this.configurationManager.save(this.locationsConfiguration);
     }
@@ -178,5 +211,4 @@ public void removeJailArea() {
         this.locationsConfiguration.jail = LocationsConfiguration.EMPTY_POSITION;
         this.configurationManager.save(this.locationsConfiguration);
     }
-
 }
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..b6fb3104e 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,13 @@
 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..19ed406b0 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
@@ -4,11 +4,13 @@
 import com.eternalcode.core.injector.annotations.component.Task;
 import com.eternalcode.core.notice.NoticeService;
 import com.eternalcode.core.util.DurationUtil;
+
 import java.util.concurrent.TimeUnit;
+
 import org.bukkit.Server;
 import org.bukkit.entity.Player;
 
-@Task(period = 1, delay = 1, unit = TimeUnit.SECONDS)
+@Task(period = 30, delay = 30, unit = TimeUnit.SECONDS)
 class JailTask implements Runnable {
 
     private final JailService jailService;
@@ -25,26 +27,27 @@ class JailTask implements Runnable {
     @Override
     public void run() {
         for (JailedPlayer jailedPlayer : this.jailService.getJailedPlayers()) {
-            Player player = this.server.getPlayer(jailedPlayer.getPlayerUniqueId());
+            Player player = this.server.getPlayer(jailedPlayer.playerUniqueId());
 
             if (player == null) {
                 continue;
             }
 
-            this.noticeService.create()
-                .notice(translation -> translation.jailSection().jailDetainCountdown())
-                .placeholder("{REMAINING_TIME}", DurationUtil.format(jailedPlayer.getRemainingTime(), true))
-                .player(jailedPlayer.getPlayerUniqueId())
-                .send();
-
             if (jailedPlayer.isPrisonExpired()) {
                 this.noticeService.create()
-                    .notice(translation -> translation.jailSection().jailReleasePrivate())
-                    .player(jailedPlayer.getPlayerUniqueId())
+                    .notice(translation -> translation.jail().released())
+                    .player(jailedPlayer.playerUniqueId())
                     .send();
 
                 this.jailService.releasePlayer(player);
+                continue;
             }
+
+            this.noticeService.create()
+                .notice(translation -> translation.jail().detainCountdown())
+                .placeholder("{REMAINING_TIME}", DurationUtil.format(jailedPlayer.remainingTime(), true))
+                .player(jailedPlayer.playerUniqueId())
+                .send();
         }
     }
 }
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailedPlayerImpl.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailedPlayerImpl.java
new file mode 100644
index 000000000..91a3b0e39
--- /dev/null
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/JailedPlayerImpl.java
@@ -0,0 +1,83 @@
+package com.eternalcode.core.feature.jail;
+
+import com.eternalcode.commons.bukkit.position.Position;
+import com.eternalcode.commons.bukkit.position.PositionAdapter;
+import java.time.Duration;
+import java.time.Instant;
+import java.util.UUID;
+import org.bukkit.Location;
+
+public class JailedPlayerImpl implements JailedPlayer {
+
+    private final UUID playerUUID;
+    private final Instant detainedAt;
+    private final Duration prisonTime;
+    private final String detainedBy;
+    private final Position lastPosition;
+
+    public JailedPlayerImpl(
+        UUID playerUUID,
+        Instant detainedAt,
+        Duration prisonTime,
+        String detainedBy,
+        Location lastLocation) {
+        if (playerUUID == null) {
+            throw new IllegalArgumentException("Player UUID cannot be null");
+        }
+        if (detainedAt == null) {
+            throw new IllegalArgumentException("Detained at cannot be null");
+        }
+        if (prisonTime == null || prisonTime.isNegative() || prisonTime.isZero()) {
+            throw new IllegalArgumentException("Prison time must be positive");
+        }
+        if (detainedBy == null || detainedBy.isBlank()) {
+            throw new IllegalArgumentException("Detained by cannot be null or blank");
+        }
+
+        this.playerUUID = playerUUID;
+        this.detainedAt = detainedAt;
+        this.prisonTime = prisonTime;
+        this.detainedBy = detainedBy;
+        this.lastPosition = lastLocation != null ? PositionAdapter.convert(lastLocation) : null;
+    }
+
+    @Override
+    public UUID playerUniqueId() {
+        return this.playerUUID;
+    }
+
+    @Override
+    public Instant detainedAt() {
+        return this.detainedAt;
+    }
+
+    @Override
+    public Duration prisonTime() {
+        return this.prisonTime;
+    }
+
+    @Override
+    public String detainedBy() {
+        return this.detainedBy;
+    }
+
+    @Override
+    public Location lastLocation() {
+        return this.lastPosition != null ? PositionAdapter.convert(this.lastPosition) : null;
+    }
+
+    @Override
+    public boolean isPrisonExpired() {
+        return this.detainedAt.plus(this.prisonTime).isBefore(Instant.now());
+    }
+
+    @Override
+    public Instant releaseTime() {
+        return this.detainedAt.plus(this.prisonTime);
+    }
+
+    @Override
+    public Duration remainingTime() {
+        return Duration.between(Instant.now(), this.detainedAt.plus(this.prisonTime));
+    }
+}
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/PrisonerRepository.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/PrisonerRepository.java
index 4dd7d2405..e383ff0ad 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/PrisonerRepository.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/PrisonerRepository.java
@@ -1,6 +1,5 @@
 package com.eternalcode.core.feature.jail;
 
-import java.util.List;
 import java.util.Optional;
 import java.util.Set;
 import java.util.UUID;
@@ -14,12 +13,7 @@ interface PrisonerRepository {
 
     void deletePrisoner(UUID uuid);
 
-    void editPrisoner(JailedPlayer jailedPlayer);
-
-    void deleteAllPrisoners();
-
-    CompletableFuture<List<JailedPlayer>> getAllPrisoners();
-
     void savePrisoner(JailedPlayer jailedPlayer);
 
+    void deleteAllPrisoners();
 }
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/PrisonerRepositoryOrmLite.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/PrisonerRepositoryOrmLite.java
index 83e1fbe57..8692050aa 100644
--- a/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/PrisonerRepositoryOrmLite.java
+++ b/eternalcore-core/src/main/java/com/eternalcode/core/feature/jail/PrisonerRepositoryOrmLite.java
@@ -1,15 +1,12 @@
 package com.eternalcode.core.feature.jail;
 
 import com.eternalcode.commons.scheduler.Scheduler;
-import com.eternalcode.core.database.DatabaseManager;
 import com.eternalcode.core.database.AbstractRepositoryOrmLite;
+import com.eternalcode.core.database.DatabaseManager;
 import com.eternalcode.core.injector.annotations.Inject;
 import com.eternalcode.core.injector.annotations.component.Repository;
-
 import com.j256.ormlite.table.TableUtils;
-
 import java.sql.SQLException;
-import java.util.List;
 import java.util.Optional;
 import java.util.Set;
 import java.util.UUID;
@@ -28,7 +25,7 @@ private PrisonerRepositoryOrmLite(DatabaseManager databaseManager, Scheduler sch
     @Override
     public CompletableFuture<Optional<JailedPlayer>> getPrisoner(UUID uuid) {
         return this.selectSafe(PrisonerTable.class, uuid)
-            .thenApply(optional -> optional.map(prisonerTable -> prisonerTable.toPrisoner()));
+            .thenApply(optional -> optional.map(PrisonerTable::toPrisoner));
     }
 
     @Override
@@ -45,7 +42,7 @@ public void deletePrisoner(UUID uuid) {
     }
 
     @Override
-    public void editPrisoner(JailedPlayer jailedPlayer) {
+    public void savePrisoner(JailedPlayer jailedPlayer) {
         this.save(PrisonerTable.class, PrisonerTable.from(jailedPlayer));
     }
 
@@ -53,18 +50,4 @@ public void editPrisoner(JailedPlayer jailedPlayer) {
     public void deleteAllPrisoners() {
         this.delete(PrisonerTable.class, new PrisonerTable());
     }
-
-    @Override
-    public CompletableFuture<List<JailedPlayer>> getAllPrisoners() {
-        return this.selectAll(PrisonerTable.class)
-            .thenApply(prisonerTables -> prisonerTables.stream()
-                .map(PrisonerTable::toPrisoner)
-                .toList());
-    }
-
-    @Override
-    public void savePrisoner(JailedPlayer jailedPlayer) {
-        this.save(PrisonerTable.class, PrisonerTable.from(jailedPlayer));
-    }
-
 }
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..a9cecacd5 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,12 +1,13 @@
 package com.eternalcode.core.feature.jail;
 
+import com.eternalcode.core.database.persister.LocationPersister;
 import com.j256.ormlite.field.DataType;
 import com.j256.ormlite.field.DatabaseField;
 import com.j256.ormlite.table.DatabaseTable;
-
 import java.time.Duration;
 import java.time.Instant;
 import java.util.UUID;
+import org.bukkit.Location;
 
 @DatabaseTable(tableName = "eternal_core_prisoners")
 class PrisonerTable {
@@ -14,7 +15,6 @@ class PrisonerTable {
     @DatabaseField(columnName = "id", id = true)
     private UUID uuid;
 
-
     @DatabaseField(columnName = "detained_at", dataType = DataType.SERIALIZABLE)
     private Instant detainedAt;
 
@@ -24,26 +24,41 @@ class PrisonerTable {
     @DatabaseField(columnName = "detained_by")
     private String detainedBy;
 
+    @DatabaseField(
+        columnName = "last_location",
+        persisterClass = LocationPersister.class,
+        dataType = DataType.LONG_STRING
+    )
+    private Location lastLocation;
+
     PrisonerTable() {
     }
 
-    PrisonerTable(UUID uuid, Instant detainedAt, Duration duration, String detainedBy) {
+    PrisonerTable(UUID uuid, Instant detainedAt, Duration duration, String detainedBy, Location lastLocation) {
         this.uuid = uuid;
         this.detainedAt = detainedAt;
         this.duration = duration;
         this.detainedBy = detainedBy;
-    }
-
-    JailedPlayer toPrisoner() {
-        return new JailedPlayer(this.uuid, this.detainedAt, this.duration, this.detainedBy);
+        this.lastLocation = lastLocation;
     }
 
     static PrisonerTable from(JailedPlayer jailedPlayer) {
         return new PrisonerTable(
-            jailedPlayer.getPlayerUniqueId(),
-            jailedPlayer.getDetainedAt(),
-            jailedPlayer.getPrisonTime(),
-            jailedPlayer.getDetainedBy()
+            jailedPlayer.playerUniqueId(),
+            jailedPlayer.detainedAt(),
+            jailedPlayer.prisonTime(),
+            jailedPlayer.detainedBy(),
+            jailedPlayer.lastLocation()
+        );
+    }
+
+    JailedPlayer toPrisoner() {
+        return new JailedPlayerImpl(
+            this.uuid,
+            this.detainedAt,
+            this.duration,
+            this.detainedBy,
+            this.lastLocation
         );
     }
 }
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..afebe6982 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
@@ -9,42 +9,43 @@
 @Getter
 @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!");
-
-    @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!");
-    @Comment({" ", "# {PLAYER} - Player who has been detained"})
-    public Notice jailDetainOverride =
-        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!");
-    @Comment({" ", "# {REMAINING_TIME} - Time left to release"})
-    public Notice jailDetainCountdown =
-        Notice.actionbar("<red> You are in jail! <gray>Time left: <red>{REMAINING_TIME}!");
-    @Comment({" ", "# {PLAYER} - Admin who you can't detain"})
-    public Notice jailDetainAdmin =
-        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 =
-        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!");
-    @Comment({" ", "# {PLAYER} - Player nickname"})
-    public Notice jailIsNotPrisoner = 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!");
-    @Comment({" ", "# {PLAYER} - Player who has been detained", "# {REMAINING_TIME} - Time of detention",
-                  "# {DETAINED_BY} - Player who detained the player"})
-    public Notice jailListPlayerEntry = Notice.chat(
-        "<green>► <white>{PLAYER} <gray>(<white>{REMAINING_TIME}<gray>) <white>detained by <green>{DETAINED_BY} <white>!");
+
+    @Comment("# Messages related to jail location setup")
+    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("# Messages related to jailing players")
+    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 while jailed!");
+
+    @Comment("# {PLAYER} - name of the player who was jailed again")
+    public Notice detainOverride = Notice.chat("<green>► <white>You have overridden the jail for <green>{PLAYER}<white>!");
+
+    @Comment("# {PLAYER} - name of the player who was jailed")
+    public Notice detainBroadcast = Notice.chat("<green>► <white>Player <green>{PLAYER} <white>has been jailed!");
+
+    @Comment("# {REMAINING_TIME} - time left until release")
+    public Notice detainCountdown = Notice.actionbar("<red>You are in jail! <gray>Time left: <red>{REMAINING_TIME}!");
+
+    @Comment("# {PLAYER} - admin who cannot be jailed")
+    public Notice detainAdmin = Notice.chat("<red>✘ <dark_red>You can’t jail <red>{PLAYER}<dark_red> because they are an admin!");
+
+    @Comment("# Messages related to releasing players from jail")
+    @Comment("# {PLAYER} - name of the player who was released")
+    public Notice releaseBroadcast = Notice.chat("<green>► <white>Player <green>{PLAYER} <white>has been released!");
+    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 are currently jailed!");
+
+    @Comment("# {PLAYER} - name of the player who is not jailed")
+    public Notice isNotPrisoner = Notice.chat("<red>✘ <dark_red>Player {PLAYER} is not jailed!");
+
+    @Comment("# Messages related to listing jailed players")
+    public Notice listHeader = Notice.chat("<green>► <white>Players currently in jail:");
+    public Notice listEmpty = Notice.chat("<red>✘ <dark_red>No players are currently jailed!");
+
+    @Comment("# {PLAYER} - jailed player, {DETAINED_BY} - player who jailed them, {REMAINING_TIME} - time left until release")
+    public Notice listPlayerEntry = Notice.chat("<green>► <white>{PLAYER} <gray>(<white>{REMAINING_TIME}<gray>) <white>jailed 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..67e1f75c4 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
@@ -9,39 +9,44 @@
 @Getter
 @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!");
-
-    @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!");
-    @Comment({" ", "# {PLAYER} - Gracz który został uwięziony"})
-    public Notice jailDetainBroadcast = Notice.chat("<green>► <white>Gracz <green>{PLAYER} <white>został uwięziony!");
-    @Comment({" ", "# {PLAYER} - Gracz który został uwięziony"})
-    public Notice jailDetainOverride =
-        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!");
-    @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}!");
-
-    @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!");
-    @Comment({" ", "# {PLAYER} - Nazwa gracza"})
-    public Notice jailIsNotPrisoner = 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!");
-    @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(
-        "<green>► <white>Gracz <green>{PLAYER} <white>został uwięziony przez <green>{DETAINED_BY} <white>na czas <green>{REMAINING_TIME} <white>!");
+
+    @Comment("# Wiadomości dotyczące ustawiania lokalizacji więzienia (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>Nadpisano istniejącą lokalizację jail'a!");
+
+    @Comment("# Wiadomości dotyczące uwięzienia gracza")
+    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} - nazwa gracza, który został uwięziony")
+    public Notice detainBroadcast = Notice.chat("<green>► <white>Gracz <green>{PLAYER} <white>został uwięziony!");
+
+    @Comment("# {PLAYER} - nazwa gracza, któremu ponownie nadano karę")
+    public Notice detainOverride = Notice.chat("<green>► <white>Nadpisano karę gracza <green>{PLAYER}<white>!");
+
+    @Comment("# {REMAINING_TIME} - czas pozostały do uwolnienia gracza")
+    public Notice detainCountdown = Notice.actionbar("<red>Pozostało <green>{REMAINING_TIME} <red>do uwolnienia!");
+
+    @Comment("# {PLAYER} - nazwa administratora, którego nie można uwięzić")
+    public Notice detainAdmin = Notice.chat("<red>✘ <dark_red>Nie możesz uwięzić administratora <red>{PLAYER}!");
+
+    @Comment("# Wiadomości dotyczące uwolnienia gracza")
+    @Comment("# {PLAYER} - nazwa gracza, który został uwolniony")
+    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, który nie jest uwięziony")
+    public Notice isNotPrisoner = Notice.chat("<red>✘ <dark_red>Gracz {PLAYER} nie jest uwięziony!");
+
+    @Comment("# Wiadomości dotyczące listy graczy przebywających w jail'u")
+    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} - uwięziony gracz, {DETAINED_BY} - osoba, która go uwięziła, {REMAINING_TIME} - czas pozostały do uwolnienia")
+    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/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 2f8c655e1..afe9a8a39 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
@@ -29,5 +29,4 @@ public class PLArgumentMessages extends OkaeriConfig implements ArgumentMessages
     public Notice noArgument = Notice.chat("<red>✘ <dark_red>Taki argument nie istnieje!");
     public Notice worldDoesntExist = Notice.chat("<red>✘ <dark_red>Świat <dark_red>{WORLD} <red>nie istnieje!");
     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 c9c4682b5..c553d2642 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
@@ -235,7 +235,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 1701c89a3..e237f408e 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
@@ -54,14 +54,6 @@
 @Accessors(fluent = true)
 public class ENTranslation extends AbstractTranslation {
 
-    public ENTranslation(Language language) {
-        super(language);
-    }
-
-    public ENTranslation() {
-        this(Language.EN);
-    }
-
     @Comment({
         "#",
         "# This file is responsible for the English translation in eternalcore.",
@@ -125,69 +117,182 @@ public ENTranslation() {
     })
     @Comment("# This section is responsible for all messages used during bad of a command argument")
     public ENArgumentMessages argument = new ENArgumentMessages();
-
     @Comment({
         " ",
         "# This answer is responsible for the general formatting of some values",
         "# The purpose of the section is to reduce the repetition of some messages."
     })
     public ENFormatSection format = new ENFormatSection();
-
     @Comment("# This section is responsible for all messages related to item editing.")
     public ENItemEditMessages itemEdit = new ENItemEditMessages();
-
     @Comment({
         " ",
         "# This section is responsible for the messages of the /signeditor command",
     })
     public ENSignEditorMessages signEditor = new ENSignEditorMessages();
-
-    @Override
-    public File getConfigFile(File dataFolder) {
-        return new File(dataFolder, "lang" + File.separator + "en_messages.yml");
-    }
-
-    @Getter
-    public static class ENFormatSection extends OkaeriConfig implements Format {
-        public String enable = "<green>enabled";
-        public String disable = "<red>disabled";
-    }
-
     @Comment({
         " ",
         "# This section is responsible for the player support chat /helpop",
     })
     public ENHelpOpMessages helpOp = new ENHelpOpMessages();
-
     @Comment({
         " ",
         "# This section is responsible for the messages of the /seen command"
     })
     public ENSeenMessages seen = new ENSeenMessages();
-
     @Comment({
         " ",
         "# This section is responsible for the communication between administration",
     })
     public ENAdminChatMessages adminChat = new ENAdminChatMessages();
-
     @Comment({
         " ",
         "# This section is responsible for ignore-related messages"
     })
     public ENIgnoreMessages ignore = new ENIgnoreMessages();
-
     @Comment({
         " ",
         "# This section is responsible for the messages of the /sudo command",
     })
     public ENSudoMessages sudo = new ENSudoMessages();
-
     @Comment({
         " ",
         "# This section is responsible for messages related to teleportation",
     })
     public ENTeleportSection teleport = new ENTeleportSection();
+    @Comment({
+        " ",
+        "# This section is responsible for the messages of the /tprp command",
+    })
+    public ENTeleportToRandomPlayerMessages teleportToRandomPlayer = new ENTeleportToRandomPlayerMessages();
+    @Comment({
+        " ",
+        "# This section is responsible for messages related to random teleport",
+    })
+    public ENRandomTeleportMessages randomTeleport = new ENRandomTeleportMessages();
+    public ENChatSection chat = new ENChatSection();
+    @Comment({
+        " ",
+        "# This section is responsible for the messages of the /broadcast command",
+    })
+    public ENBroadcastMessages broadcast = new ENBroadcastMessages();
+    @Comment({
+        " ",
+        "# This section is responsible for handling tpa requests,",
+        "# It gives you the ability to edit queries of this type",
+    })
+    public ENTeleportRequestMessages tpa = new ENTeleportRequestMessages();
+    @Comment({
+        " ",
+        "# This section is responsible for setting and editing fast travel points - warp",
+    })
+    public ENWarpMessages warp = new ENWarpMessages();
+    @Comment({
+        " ",
+        "# The following section is responsible for setting and editing personal fast travel points - home",
+    })
+    public ENHomeMessages home = new ENHomeMessages();
+    @Comment({
+        " ",
+        "# This section is responsible for setting and editing private messages."
+    })
+    public ENMsgMessages msg = new ENMsgMessages();
+    @Comment({
+        " ",
+        "# Section responsible for AFK."
+    })
+    public ENAfkMessages afk = new ENAfkMessages();
+    @Comment({
+        " ",
+        "# This section is responsible for death messages"
+    })
+    public ENDeathMessages deathMessage = new ENDeathMessages();
+    @Comment({" ", "# Section responsible for inventories-related stuff."})
+    public ENInventorySection inventory = new ENInventorySection();
+    @Comment("# This section is responsible for /clear command")
+    public ENClearMessages clear = new ENClearMessages();
+    @Comment({
+        " ",
+        "# This section is responsible for player-related stuff and interactions with them."
+    })
+    public ENPlayerSection player = new ENPlayerSection();
+    @Comment({" ", "# This section is responsible for spawn-related stuff."})
+    public ENSpawnMessages spawn = new ENSpawnMessages();
+    @Comment({
+        " ",
+        "# This section is responsible for messages regarding item attributes."
+    })
+    public ENItemSection item = new ENItemSection();
+    @Comment({
+        " ",
+        "# This section is responsible for repair messages"
+    })
+    public ENRepairMessages repair = new ENRepairMessages();
+    @Comment({" ", "# Messages sent on time and weather change."})
+    public ENTimeAndWeatherMessages timeAndWeather = new ENTimeAndWeatherMessages();
+    @Comment({" ", "# Messages responsible for containers"})
+    public ENContainerMessages container = new ENContainerMessages();
+    @Comment({" ", "# Set's max players on the server, the messages for the /setslot command"})
+    public ENSetSlotMessages setSlot = new ENSetSlotMessages();
+    @Comment({" ", "# Auto message"})
+    public ENAutoMessageMessages autoMessage = new ENAutoMessageMessages();
+    @Comment({" ", "# This section is responsible for handling jail-related stuff."})
+    public ENJailMessages jail = new ENJailMessages();
+    @Comment({" ", "# This section is responsible for elder guardian messages."})
+    public ENElderGuardianMessages elderGuardian = new ENElderGuardianMessages();
+    @Comment({" ", "# This section is responsible for demo screen messages."})
+    public ENDemoScreenMessages demoScreen = new ENDemoScreenMessages();
+    @Comment({" ", "# This section is responsible for join message."})
+    public ENJoinMessage join = new ENJoinMessage();
+    @Comment({" ", "# This section is responsible for quit message."})
+    public ENQuitMessage quit = new ENQuitMessage();
+    @Comment({" ", "# This section is responsible for end screen messages."})
+    public ENEndScreenMessages endScreen = new ENEndScreenMessages();
+    @Comment({" ", "# This section is responsible for '/burn' command messages."})
+    public ENBurnMessages burn = new ENBurnMessages();
+    @Comment({" ", "# This section is responsible for vanish-related stuff."})
+    public ENVanishMessages vanish = new ENVanishMessages();
+    @Comment({" ", "# This section is responsible for '/near' command messages."})
+    public ENNearMessages near = new ENNearMessages();
+    @Comment({" ", "# This section is responsible for the messages of the MOTD feature."})
+    public ENMotdMessages motd = new ENMotdMessages();
+    @Comment({" ", "# This section is responsible for teleporting to offline players."})
+    public ENTeleportOfflineMessages teleportToOfflinePlayer = new ENTeleportOfflineMessages();
+    @Comment({" ", "# This section is responsible for information about players' game time."})
+    public ENPlaytimeMessages playtime = new ENPlaytimeMessages();
+    @Comment({" ", "# This section is responsible for the messages of the freeze feature."})
+    public ENFreezeMessages freeze = new ENFreezeMessages();
+    @Comment({" ", "# This section is responsible for powertool messages."})
+    public ENPowertoolMessages powertool = new ENPowertoolMessages();
+    @Comment({
+        " ",
+        "# This section is responsible for enchant messages"
+    })
+    ENEnchantMessages enchant = new ENEnchantMessages();
+    @Comment({
+        " ",
+        "# This section is responsible for butcher messages"
+    })
+    ENButcherMessages butcher = new ENButcherMessages();
+
+    public ENTranslation(Language language) {
+        super(language);
+    }
+
+    public ENTranslation() {
+        this(Language.EN);
+    }
+
+    @Override
+    public File getConfigFile(File dataFolder) {
+        return new File(dataFolder, "lang" + File.separator + "en_messages.yml");
+    }
+
+    @Getter
+    public static class ENFormatSection extends OkaeriConfig implements Format {
+        public String enable = "<green>enabled";
+        public String disable = "<red>disabled";
+    }
 
     @Getter
     public static class ENTeleportSection extends OkaeriConfig implements TeleportSection {
@@ -235,20 +340,6 @@ public static class ENTeleportSection extends OkaeriConfig implements TeleportSe
         public Notice lastLocationNoExist = Notice.chat("<red>✘ <dark_red>Last location is not exist!");
     }
 
-    @Comment({
-        " ",
-        "# This section is responsible for the messages of the /tprp command",
-    })
-    public ENTeleportToRandomPlayerMessages teleportToRandomPlayer = new ENTeleportToRandomPlayerMessages();
-
-    @Comment({
-        " ",
-        "# This section is responsible for messages related to random teleport",
-    })
-    public ENRandomTeleportMessages randomTeleport = new ENRandomTeleportMessages();
-
-    public ENChatSection chat = new ENChatSection();
-
     @Getter
     public static class ENChatSection extends OkaeriConfig implements ChatSection {
         @Comment({"# {PLAYER} - Player who performed the actions for the chat"})
@@ -279,66 +370,11 @@ public static class ENChatSection extends OkaeriConfig implements ChatSection {
             Notice.chat("<red>✘ <dark_red>Command <red>{COMMAND} <dark_red>doesn't exists!");
     }
 
-    @Comment({
-        " ",
-        "# This section is responsible for the messages of the /broadcast command",
-    })
-    public ENBroadcastMessages broadcast = new ENBroadcastMessages();
-
-    @Comment({
-        " ",
-        "# This section is responsible for handling tpa requests,",
-        "# It gives you the ability to edit queries of this type",
-    })
-    public ENTeleportRequestMessages tpa = new ENTeleportRequestMessages();
-
-    @Comment({
-        " ",
-        "# This section is responsible for setting and editing fast travel points - warp",
-    })
-    public ENWarpMessages warp = new ENWarpMessages();
-
-    @Comment({
-        " ",
-        "# The following section is responsible for setting and editing personal fast travel points - home",
-    })
-    public ENHomeMessages home = new ENHomeMessages();
-
-    @Comment({
-        " ",
-        "# This section is responsible for setting and editing private messages."
-    })
-    public ENMsgMessages msg = new ENMsgMessages();
-
-    @Comment({
-        " ",
-        "# Section responsible for AFK."
-    })
-    public ENAfkMessages afk = new ENAfkMessages();
-
-    @Comment({
-        " ",
-        "# This section is responsible for death messages"
-    })
-    public ENDeathMessages deathMessage = new ENDeathMessages();
-
-    @Comment({" ", "# Section responsible for inventories-related stuff."})
-    public ENInventorySection inventory = new ENInventorySection();
-
     @Getter
     public static class ENInventorySection extends OkaeriConfig implements InventorySection {
         public String disposalTitle = "<white><bold>Trash";
     }
 
-    @Comment("# This section is responsible for /clear command")
-    public ENClearMessages clear = new ENClearMessages();
-
-    @Comment({
-        " ",
-        "# This section is responsible for player-related stuff and interactions with them."
-    })
-    public ENPlayerSection player = new ENPlayerSection();
-
     @Getter
     public static class ENPlayerSection extends OkaeriConfig implements PlayerSection {
         public Notice feedMessage = Notice.chat("<green>► <white>You've been fed!");
@@ -450,15 +486,6 @@ public static class ENPlayerSection extends OkaeriConfig implements PlayerSectio
             Notice.chat("<red>✘ <dark_red>You have exceeded the number of safe chunks <red>{SAFE_CHUNKS}");
     }
 
-    @Comment({" ", "# This section is responsible for spawn-related stuff."})
-    public ENSpawnMessages spawn = new ENSpawnMessages();
-
-    @Comment({
-        " ",
-        "# This section is responsible for messages regarding item attributes."
-    })
-    public ENItemSection item = new ENItemSection();
-
     @Getter
     public static class ENItemSection extends OkaeriConfig implements ItemSection {
         @Comment({" ", "# {ITEM} - Name of received item"})
@@ -482,76 +509,4 @@ public static class ENItemSection extends OkaeriConfig implements ItemSection {
         public Notice enchantedMessageBy =
             Notice.chat("<green>► <white>Administrator <green>{PLAYER} <white>enchanted your item!");
     }
-
-    @Comment({
-        " ",
-        "# This section is responsible for repair messages"
-    })
-    public ENRepairMessages repair = new ENRepairMessages();
-
-    @Comment({
-        " ",
-        "# This section is responsible for enchant messages"
-    })
-    ENEnchantMessages enchant = new ENEnchantMessages();
-
-    @Comment({
-        " ",
-        "# This section is responsible for butcher messages"
-    })
-    ENButcherMessages butcher = new ENButcherMessages();
-
-    @Comment({" ", "# Messages sent on time and weather change."})
-    public ENTimeAndWeatherMessages timeAndWeather = new ENTimeAndWeatherMessages();
-
-    @Comment({" ", "# Messages responsible for containers"})
-    public ENContainerMessages container = new ENContainerMessages();
-
-    @Comment({" ", "# Set's max players on the server, the messages for the /setslot command"})
-    public ENSetSlotMessages setSlot = new ENSetSlotMessages();
-
-    @Comment({" ", "# Auto message"})
-    public ENAutoMessageMessages autoMessage = new ENAutoMessageMessages();
-
-    @Comment({" ", "# This section is responsible for handling jail-related stuff."})
-    public ENJailMessages jailSection = new ENJailMessages();
-
-    @Comment({" ", "# This section is responsible for elder guardian messages."})
-    public ENElderGuardianMessages elderGuardian = new ENElderGuardianMessages();
-
-    @Comment({" ", "# This section is responsible for demo screen messages."})
-    public ENDemoScreenMessages demoScreen = new ENDemoScreenMessages();
-
-    @Comment({" ", "# This section is responsible for join message."})
-    public ENJoinMessage join = new ENJoinMessage();
-
-    @Comment({" ", "# This section is responsible for quit message."})
-    public ENQuitMessage quit = new ENQuitMessage();
-
-    @Comment({" ", "# This section is responsible for end screen messages."})
-    public ENEndScreenMessages endScreen = new ENEndScreenMessages();
-
-    @Comment({" ", "# This section is responsible for '/burn' command messages."})
-    public ENBurnMessages burn = new ENBurnMessages();
-
-    @Comment({" ", "# This section is responsible for vanish-related stuff."})
-    public ENVanishMessages vanish = new ENVanishMessages();
-
-    @Comment({" ", "# This section is responsible for '/near' command messages."})
-    public ENNearMessages near = new ENNearMessages();
-
-    @Comment({" ", "# This section is responsible for the messages of the MOTD feature."})
-    public ENMotdMessages motd = new ENMotdMessages();
-
-    @Comment({" ", "# This section is responsible for teleporting to offline players."})
-    public ENTeleportOfflineMessages teleportToOfflinePlayer = new ENTeleportOfflineMessages();
-
-    @Comment({" ", "# This section is responsible for information about players' game time."})
-    public ENPlaytimeMessages playtime = new ENPlaytimeMessages();
-
-    @Comment({" ", "# This section is responsible for the messages of the freeze feature."})
-    public ENFreezeMessages freeze = new ENFreezeMessages();
-
-    @Comment({" ", "# This section is responsible for powertool messages."})
-    public ENPowertoolMessages powertool = new ENPowertoolMessages();
 }
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 1bae96122..e98584bd5 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
@@ -537,7 +537,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();