diff --git a/.github/workflows/sync-master-to-dev.yml b/.github/workflows/sync-master-to-dev.yml
index fec8e56..3273d4a 100644
--- a/.github/workflows/sync-master-to-dev.yml
+++ b/.github/workflows/sync-master-to-dev.yml
@@ -1,5 +1,6 @@
 name: Sync master → dev
 
+
 on:
   push:
     branches:
@@ -7,6 +8,7 @@ on:
 
 permissions:
   contents: write    # ensure GITHUB_TOKEN can push code
+  pull-requests: write # allow creating PRs
 
 jobs:
   sync-to-dev:
@@ -60,10 +62,10 @@ jobs:
         if: steps.merge.outcome == 'failure'
         uses: actions/github-script@v6
         with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
+          github-token: ${{ secrets.PAT_PR }}
           script: |
             // 1) Create the PR from master → dev
-            const pr = await github.pulls.create({
+            const pr = await github.rest.pulls.create({
               owner: context.repo.owner,
               repo: context.repo.repo,
               head: 'master',
@@ -72,10 +74,11 @@ jobs:
               body: 'Automatic merge from **master** into **dev** failed due to conflicts. Please resolve and merge.',
               draft: false
             });
-            // 2) Request reviews (replace with your team’s GitHub handles)
-            await github.pulls.requestReviewers({
+
+            // 2) Request reviews
+            await github.rest.pulls.requestReviewers({
               owner: context.repo.owner,
               repo: context.repo.repo,
               pull_number: pr.data.number,
-              reviewers: ['reviewer1', 'reviewer2']
+              reviewers: []
             });
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index b77afb2..4656503 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -5,7 +5,7 @@
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="" />
+        <option name="gradleJvm" value="corretto-17" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 32cf4db..fae6c8e 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -4,7 +4,7 @@
   <component name="FrameworkDetectionExcludesConfiguration">
     <file type="web" url="file://$PROJECT_DIR$" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="corretto-21" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="corretto-17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index c5df20b..65d0298 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,15 +1,31 @@
 plugins {
     id 'java-library'
     id 'maven-publish'
-    id "io.papermc.paperweight.userdev" version "2.0.0-beta.17"
+    id "io.papermc.paperweight.userdev" version "2.0.0-beta.18"
     id "com.gradleup.shadow" version "8.3.8"
+    id 'com.gorylenko.gradle-git-properties' version '2.4.1'
 }
 
 group = 'gg.nextforge'
-version = '1.0'
+version = '2.0'
 
 repositories {
     mavenCentral()
+    mavenLocal()
+}
+
+gitProperties {
+    failOnNoGitDirectory = false            // kein Fehler, falls kein .git da ist
+    dateFormat = "yyyy-MM-dd'T'HH:mm:ssZ"   // optional: Timestamp-Format
+    keys = ['git.commit.id', 'git.branch']  // nur die Keys, die du brauchst
+}
+
+sourceSets {
+    main {
+        resources {
+            srcDir "${buildDir}/generated/gitProperties"
+        }
+    }
 }
 
 dependencies {
@@ -28,9 +44,11 @@ subprojects {
     apply plugin: 'maven-publish'
     apply plugin: 'io.papermc.paperweight.userdev'
     apply plugin: 'com.gradleup.shadow'
+    apply plugin: 'com.gorylenko.gradle-git-properties'
 
     repositories {
         mavenCentral()
+        mavenLocal()
     }
 
     dependencies {
@@ -58,15 +76,21 @@ subprojects {
 
 java {
     // Use Java 21
-    sourceCompatibility = JavaVersion.VERSION_21
-    targetCompatibility = JavaVersion.VERSION_21
+    sourceCompatibility = JavaVersion.VERSION_23
+    targetCompatibility = JavaVersion.VERSION_23
     toolchain {
-        languageVersion.set(JavaLanguageVersion.of(21))
+        languageVersion.set(JavaLanguageVersion.of(23))
     }
     withJavadocJar()
     withSourcesJar()
 }
 
+javadoc {
+    options.encoding = 'UTF-8'
+    failOnError = false
+    options.addStringOption('Xdoclint:none', '-quiet')
+}
+
 tasks {
     compileJava {
         options.encoding = "UTF-8"
diff --git a/src/main/java/gg/nextforge/NextCorePlugin.java b/src/main/java/gg/nextforge/NextCorePlugin.java
index 7821a84..40e611f 100644
--- a/src/main/java/gg/nextforge/NextCorePlugin.java
+++ b/src/main/java/gg/nextforge/NextCorePlugin.java
@@ -1,16 +1,13 @@
 package gg.nextforge;
 
-import gg.nextforge.command.builtin.NPCCommand;
 import gg.nextforge.command.builtin.NextCoreCommand;
 import gg.nextforge.config.ConfigFile;
-import gg.nextforge.config.ConfigManager;
 import gg.nextforge.console.ConsoleHeader;
 import gg.nextforge.plugin.NextForgePlugin;
 import gg.nextforge.scheduler.CoreScheduler;
 import gg.nextforge.scheduler.ScheduledTask;
 import gg.nextforge.updater.CoreAutoUpdater;
 import lombok.Getter;
-import org.checkerframework.checker.units.qual.N;
 
 import java.io.IOException;
 import java.util.UUID;
@@ -18,8 +15,11 @@
 @Getter
 public class NextCorePlugin extends NextForgePlugin {
 
+    long serverUptime;
+    boolean debugMode;
     ConfigFile configFile;
     ConfigFile messagesFile;
+    CoreAutoUpdater updater;
     ScheduledTask updateCheckTask;
 
     @Override
@@ -39,15 +39,20 @@ public void enable(boolean isReload) {
             return;
         }
 
+        this.serverUptime = System.currentTimeMillis();
+
         configFile = getConfigManager().loadConfig("config.yml");
+        if (configFile.getBoolean("debug_mode", false)) {
+            this.debugMode = true;
+            getSLF4JLogger().info("[NextForge] Debug mode is enabled. This will log additional information to the console.");
+        } else {
+            this.debugMode = false;
+        }
         messagesFile = getConfigManager().loadConfig("messages.yml");
 
-        getTextManager().placeholder("prefix", p -> {
-            return messagesFile.getString("general.prefix", "<dark_gray>[<gradient:aqua:dark_aqua>ɴᴇxᴛᴄᴏʀᴇ<dark_gray>]</gradient></dark_gray>");
-        });
+        getTextManager().placeholder("prefix", _ -> messagesFile.getString("general.prefix", "<dark_gray>[<gradient:aqua:dark_aqua>ɴᴇxᴛᴄᴏʀᴇ<dark_gray>]</gradient></dark_gray>"));
 
         new NextCoreCommand(this);
-        new NPCCommand(this, getNpcManager());
 
         ConsoleHeader.send(this);
 
@@ -55,7 +60,7 @@ public void enable(boolean isReload) {
 
         getSLF4JLogger().info("[NextForge] Initializing {} v{}...", getName(), getPluginVersion());
 
-        CoreAutoUpdater updater = new CoreAutoUpdater(getDataFolder().getParentFile());
+        this.updater = new CoreAutoUpdater(getDataFolder().getParentFile());
 
         int checkMillis = configFile.getInt("updater.check_interval", 7200000);
         int checkTicks = checkMillis / 50;
diff --git a/src/main/java/gg/nextforge/command/builtin/NPCCommand.java b/src/main/java/gg/nextforge/command/builtin/NPCCommand.java
deleted file mode 100644
index 7b87201..0000000
--- a/src/main/java/gg/nextforge/command/builtin/NPCCommand.java
+++ /dev/null
@@ -1,916 +0,0 @@
-package gg.nextforge.command.builtin;
-
-import gg.nextforge.NextCorePlugin;
-import gg.nextforge.command.CommandContext;
-import gg.nextforge.command.CommandManager;
-import gg.nextforge.npc.NPCManager;
-import gg.nextforge.npc.model.NPC;
-import gg.nextforge.text.TextManager;
-import gg.nextforge.utility.ChatPagination;
-import org.bukkit.*;
-import org.bukkit.block.Block;
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.EntityType;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.EntityEquipment;
-import org.bukkit.inventory.ItemStack;
-
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-public class NPCCommand {
-
-    private final NextCorePlugin plugin;
-    private final NPCManager npcManager;
-    private final TextManager textManager;
-
-    public NPCCommand(NextCorePlugin plugin, NPCManager npcManager) {
-        this.plugin = plugin;
-        this.npcManager = npcManager;
-        this.textManager = plugin.getTextManager();
-        registerCommands();
-    }
-
-    private void registerCommands() {
-        plugin.getCommandManager().command("npc")
-                .permission("nextforge.command.npc")
-                .description("Manage your npc's with ease.")
-                .aliases("npcs", "npcmanager")
-                .executor(this::handleHelp)
-                .subcommand("help", this::handleHelp)
-                .subcommand("create", this::handleCreate)
-                .subcommand("copy", this::handleCopy)
-                .subcommand("remove", this::handleRemove)
-                .subcommand("list", this::handleList)
-                .subcommand("info", this::handleInfo)
-                .subcommand("type", this::handleType)
-                .subcommand("displayname", this::handleDisplayName)
-                .subcommand("skin", this::handleSkin)
-                .subcommand("equipment", this::handleEquipment)
-                .subcommand("glowing", this::handleGlowing)
-                .subcommand("show_in_tab", this::handleShowInTab)
-                .subcommand("collidable", this::handleCollidable)
-                .subcommand("scale", this::handleScale)
-                .subcommand("attribute", this::handleAttribute)
-                .subcommand("turn_to_player", this::handleTurnToPlayer)
-                .subcommand("turn_to_player_distance", this::handleTurnToPlayerDistance)
-                .subcommand("move_here", this::handleMoveHere)
-                .subcommand("move_to", this::handleMoveTo)
-                .subcommand("center", this::handleCenter)
-                .subcommand("nearby", this::handleNearby)
-                .subcommand("teleport", this::handleTeleport)
-                .subcommand("action", this::handleAction)
-                .subcommand("interaction_cooldown", this::handleInteractionCooldown)
-                .register();
-    }
-
-    private void handleHelp(CommandContext ctx) {
-        int page = 1;
-        if (ctx.args().length != 0) {
-            try {
-                page = Integer.parseInt(ctx.args()[0]);
-            } catch (NumberFormatException e) {
-                textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.help.invalid_page", "%prefix% <red>Invalid page number. Please enter a valid number.</red>"));
-                return;
-            }
-        }
-        ChatPagination pagination = new ChatPagination(6);
-        for (String line : plugin.getMessagesFile().getStringList("commands.npc.help.lines")) {
-            line = line.replace("%prefix%", plugin.getMessagesFile().getString("general.prefix", "<dark_gray>[<gradient:aqua:dark_aqua>ɴᴇxᴛғᴏʀɢᴇ<dark_gray>]</gradient></dark_gray>"));
-            pagination.addLine(line);
-        }
-        if (pagination.getTotalPages() < page || page < 1) {
-            textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.help.invalid_page", "%prefix% <red>Invalid page number. Please enter a valid number.</red>"));
-            return;
-        }
-        for (String header : plugin.getMessagesFile().getStringList("commands.npc.help.header")) {
-            header = header.replace("%prefix%", plugin.getMessagesFile().getString("general.prefix", "<dark_gray>[<gradient:aqua:dark_aqua>ɴᴇxᴛғᴏʀɢᴇ<dark_gray>]</gradient></dark_gray>"));
-            header = header.replace("%page%", String.valueOf(page));
-            header = header.replace("%max%", String.valueOf(pagination.getTotalPages()));
-            textManager.send(ctx.sender(), header);
-        }
-        for (String line : pagination.getPage((page-1))) {
-            textManager.send(ctx.sender(), line);
-        }
-        for (String footer : plugin.getMessagesFile().getStringList("commands.npc.help.footer")) {
-            footer = footer.replace("%prefix%", plugin.getMessagesFile().getString("general.prefix", "<dark_gray>[<gradient:aqua:dark_aqua>ɴᴇxᴛғᴏʀɢᴇ<dark_gray>]</gradient></dark_gray>"));
-            footer = footer.replace("%page%", String.valueOf(page));
-            footer = footer.replace("%max%", String.valueOf(pagination.getTotalPages()));
-            textManager.send(ctx.sender(), footer);
-        }
-    }
-
-    private void handleCreate(CommandContext ctx) {
-        if (ctx.args().length < 1) {
-            textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.create.usage", "%prefix% <red>Usage: /npc create (name)</red>"));
-            return;
-        }
-        String id = ctx.args()[0];
-        if (npcManager.getNpcs().containsKey(id)) {
-            textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.create.already-exists", "%prefix% <red>NPC with ID '%name%' already exists.</red>").replace("%name%", id));
-            return;
-        }
-        if (!(ctx.sender() instanceof Player)) {
-            textManager.send(ctx.sender(), plugin.getMessagesFile().getString("general.only-players", "%prefix% <red>This command can only be used by players.</red>"));
-            return;
-        }
-        Player player = (Player) ctx.sender();
-        Location loc = player.getLocation();
-        NPC npc = NPC.builder()
-                .id(id)
-                .type(EntityType.VILLAGER.name())
-                .displayName(id)
-                .skin(null)
-                .glowing(false)
-                .showInTab(true)
-                .collidable(true)
-                .scale(1.0)
-                .transientNPC(false)
-                .interactionCooldown(0)
-                .turnToPlayer(false)
-                .turnToPlayerDistance(3.0)
-                .attributes(new java.util.HashMap<>())
-                .actions(new java.util.ArrayList<>())
-                .location(loc)
-                .build();
-        npcManager.register(npc);
-        npcManager.save();
-        textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.create.success", "%prefix% <green>NPC '%name%' created successfully at your location.</green>").replace("%name%", id));
-    }
-
-    private void handleCopy(CommandContext ctx) {
-        if (ctx.args().length < 2) {
-            textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.copy.usage", "%prefix% <red>Usage: /npc copy (npc) (new_name)</red>"));
-            return;
-        }
-        String src = ctx.args()[0], dest = ctx.args()[1];
-        NPC orig = npcManager.getNpcs().get(src);
-        if (orig == null) {
-            textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.copy.not-found", "%prefix% <red>NPC '%name%' not found.</red>").replace("%name%", src));
-            return;
-        }
-        if (npcManager.getNpcs().containsKey(dest)) {
-            textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.copy.already-exists", "%prefix% <red>NPC with ID '%new_name%' already exists.</red>").replace("%new_name%", dest));
-            return;
-        }
-        NPC copy = NPC.builder()
-                .id(dest)
-                .type(orig.getType())
-                .displayName(orig.getDisplayName())
-                .skin(orig.getSkin())
-                .glowing(orig.isGlowing())
-                .showInTab(orig.isShowInTab())
-                .collidable(orig.isCollidable())
-                .scale(orig.getScale())
-                .transientNPC(orig.isTransientNPC())
-                .interactionCooldown(orig.getInteractionCooldown())
-                .turnToPlayer(orig.isTurnToPlayer())
-                .turnToPlayerDistance(orig.getTurnToPlayerDistance())
-                .attributes(new java.util.HashMap<>(orig.getAttributes()))
-                .actions(new java.util.ArrayList<>(orig.getActions()))
-                .location(orig.getLocation())
-                .build();
-        npcManager.register(copy);
-        npcManager.save();
-        textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.copy.success", "%prefix% <green>NPC '%name%' copied to '%new_name%' successfully.</green>").replace("%name%", src).replace("%new_name%", dest));
-    }
-
-    private void handleRemove(CommandContext ctx) {
-        if (ctx.args().length < 1) {
-            textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.remove.usage", "%prefix% <red>Usage: /npc remove <id></red>"));
-            return;
-        }
-        String id = ctx.args()[0];
-        NPC npc = npcManager.getNpcs().get(id);
-        if (npc == null) {
-            textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.remove.not-found", "%prefix% <red>NPC '%name%' not found.</red>").replace("%name%", id));
-            return;
-        }
-        npcManager.remove(npc);
-        npcManager.save();
-        textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.remove.success", "%prefix% <green>NPC '%name%' removed successfully.</green>").replace("%name%", id));
-    }
-
-
-    private void handleList(CommandContext ctx) {
-        List<NPC> list = npcManager.getNpcs().values().stream().toList();
-        if (list.isEmpty()) {
-            textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.list.empty", "%prefix% <yellow>No NPCs found.</yellow>"));
-            return;
-        }
-        ChatPagination pagination = new ChatPagination(5);
-        for (NPC npc : list) {
-            String line = plugin.getMessagesFile().getString("commands.npc.list.line", "<gold>│</gold>  <hover:show_text:'Click to teleport to %name%'><click:run_command='/npc info %name%'><gray>%id% <yellow>%name%</yellow> <dark_gray>- </dark_gray>%type% <gray>(%skin%)</gray></click></hover>")
-                    .replace("%id%", npc.getId())
-                    .replace("%name%", npc.getDisplayName())
-                    .replace("%type%", npc.getType())
-                    .replace("%skin%", npc.getSkin() != null ? npc.getSkin() : "default");
-            line = line.replace("%prefix%", plugin.getMessagesFile().getString("general.prefix", "<dark_gray>[<gradient:aqua:dark_aqua>ɴᴇxᴛғᴏʀɢᴇ<dark_gray>]</gradient></dark_gray>"));
-            pagination.addLine(line);
-        }
-        int page = 1;
-        if (ctx.args().length > 0) {
-            try { page = Integer.parseInt(ctx.args()[0]); } catch (NumberFormatException ignored) {}
-        }
-        if (page < 1 || page > pagination.getTotalPages()) page = 1;
-        int finalPage = page;
-        plugin.getMessagesFile().getStringList("commands.npc.list.header").forEach(line -> {
-            line = line.replace("%prefix%", plugin.getMessagesFile().getString("general.prefix", "<dark_gray>[<gradient:aqua:dark_aqua>ɴᴇxᴛғᴏʀɢᴇ<dark_gray>]</gradient></dark_gray>"));
-            line = line.replace("%page%", String.valueOf(finalPage));
-            line = line.replace("%max%", String.valueOf(pagination.getTotalPages()));
-            textManager.send(ctx.sender(), line);
-        });
-        pagination.getPage(page - 1).forEach(line -> textManager.send(ctx.sender(), line));
-    }
-
-    private void handleInfo(CommandContext ctx) {
-        if (ctx.args().length < 1) {
-            textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.info.usage", "%prefix% <red>Usage: /npc info (npc)</red>"));
-            return;
-        }
-        NPC npc = npcManager.getNpcs().get(ctx.args()[0]);
-        if (npc == null) {
-            textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.info.not-found", "%prefix% <red>NPC '%name%' not found.</red>").replace("%name%", ctx.args()[0]));
-            return;
-        }
-        for (String header : plugin.getMessagesFile().getStringList("commands.npc.info.header")) {
-            header = header.replace("%name%", npc.getDisplayName());
-            textManager.send(ctx.sender(), header);
-        }
-        for (String line : plugin.getMessagesFile().getStringList("commands.npc.info.lines")) {
-            line = line.replace("%id%", npc.getId())
-                    .replace("%name%", npc.getDisplayName())
-                    .replace("%type%", npc.getType())
-                    .replace("%skin%", npc.getSkin() != null ? npc.getSkin() : "default")
-                    .replace("%glowing%", npc.isGlowing() ? "Yes" : "No")
-                    .replace("%show_in_tab%", npc.isShowInTab() ? "Yes" : "No")
-                    .replace("%collidable%", npc.isCollidable() ? "Yes" : "No")
-                    .replace("%scale%", String.valueOf(npc.getScale()))
-                    .replace("%interaction_cooldown%", String.valueOf(npc.getInteractionCooldown()))
-                    .replace("%turn_to_player%", npc.isTurnToPlayer() ? "Yes" : "No")
-                    .replace("%turn_to_player_distance%", String.valueOf(npc.getTurnToPlayerDistance()))
-                    .replace("%transient%", npc.isTransientNPC() ? "Yes" : "No")
-                    .replace("%x%", String.valueOf(npc.getLocation().getX()))
-                    .replace("%y%", String.valueOf(npc.getLocation().getY()))
-                    .replace("%z%", String.valueOf(npc.getLocation().getZ()))
-                    .replace("%world%", npc.getLocation().getWorld().getName());
-            textManager.send(ctx.sender(), line);
-        }
-        textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.info.actions.header", "<gold>│</gold>  <gray>Actions:</gray>"));
-        if (npc.getActions().isEmpty()) {
-            textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.info.actions.empty", "<gold>│</gold>  <gray>No actions defined.</gray>"));
-        } else {
-            for (String action : npc.getActions()) {
-                textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.info.actions.line", "<gold>│</gold>  <gray>%action% (%trigger%)</gray>").replace("%action%", action)
-                        .replace("%trigger%", action.split(" ")[0])  // Assuming the trigger is the first word in the action string
-                );
-            }
-        }
-        textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.info.attributes.header", "<gold>│</gold>  <gray>Attributes:</gray>"));
-        if (npc.getAttributes().isEmpty()) {
-            textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.info.attributes.empty", "<gold>│</gold>  <gray>No attributes defined.</gray>"));
-        } else {
-            for (String key : npc.getAttributes().keySet()) {
-                String value = npc.getAttributes().get(key);
-                textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.info.attributes.line", "<gold>│</gold>  <gray>%key%: %value%</gray>").replace("%key%", key).replace("%value%", value));
-            }
-        }
-        for (String footer : plugin.getMessagesFile().getStringList("commands.npc.info.footer")) {
-            footer = footer.replace("%name%", npc.getDisplayName());
-            textManager.send(ctx.sender(), footer);
-        }
-    }
-
-    private void handleType(CommandContext ctx) {
-        if (ctx.args().length < 2) {
-            textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.type.usage", "%prefix% <red>Usage: /npc type (npc) (type)</red>"));
-            return;
-        }
-        String id = ctx.args()[0], type = ctx.args()[1];
-        NPC npc = npcManager.getNpcs().get(id);
-        if (npc == null) {
-            textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.type.not-found", "%prefix% <red>NPC '%name%' not found.</red>").replace("%name%", id));
-            return;
-        }
-        EntityType entityType;
-        try {
-            entityType = EntityType.valueOf(type.toUpperCase());
-        } catch (IllegalArgumentException e) {
-            textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.type.invalid-type", "%prefix% <red>Invalid NPC type '%type%'. Available Types: %valid_types%</red>").replace("%type%", type)
-                    .replace("%valid_types%", Arrays.stream(EntityType.values()).map(Enum::name).collect(Collectors.joining(", ")))
-            );
-            return;
-        }
-        npcManager.modify(id, npcBuilder -> {
-            npcBuilder.setType(entityType.name().toUpperCase());
-            return npcBuilder;
-        });
-        npcManager.save();
-        textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.type.success", "%prefix% <green>NPC '%name%' type changed to '%type%' successfully.</green>").replace("%name%", id).replace("%type%", entityType.name()));
-    }
-
-    private void handleDisplayName(CommandContext ctx) {
-        if (ctx.args().length < 2) {
-            textManager.send(ctx.sender(), "Usage: /npc displayname <id> <name|@none>");
-            return;
-        }
-        String id = ctx.args()[0];
-        NPC npc = npcManager.getNpcs().get(id);
-        if (npc == null) {
-            textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.displayname.not-found", "%prefix% <red>NPC '%name%' not found.</red>").replace("%name%", id));
-            return;
-        }
-        String displayName = ctx.args()[1];
-        if (displayName.equalsIgnoreCase("@none")) {
-            displayName = null; // Reset to default
-        } else if (displayName.startsWith("@")) {
-            textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.displayname.invalid", "%prefix% <red>Invalid display name '%name%'. Use '@none' to reset.</red>").replace("%name%", displayName));
-            return;
-        }
-        String finalDisplayName = displayName;
-        npcManager.modify(id, npcBuilder -> {
-            npcBuilder.setDisplayName(finalDisplayName);
-            return npcBuilder;
-        });
-        if (finalDisplayName == null) {
-            textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.displayname.success-cleared", "%prefix% <green>NPC '%name%' display name reset to default.</green>").replace("%name%", id));
-        } else {
-            textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.displayname.success-set", "%prefix% <green>NPC '%name%' display name changed to '%displayName%'.</green>").replace("%name%", id).replace("%displayName%", finalDisplayName));
-        }
-    }
-
-    private void handleSkin(CommandContext ctx) {
-        if (ctx.args().length < 2) {
-            textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.skin.usage", "%prefix% <red>Usage: /npc skin (npc) (skin_value | @none | @mirror) [--slim]</red>"));
-            return;
-        }
-        String id = ctx.args()[0];
-        NPC existing = npcManager.getNpcs().get(id);
-        if (existing == null) {
-            textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.skin.not-found", "%prefix% <red>NPC '%name%' not found.</red>").replace("%name%", id));
-            return;
-        }
-        String option = ctx.args()[1];
-        boolean slim = false;
-        for (String arg : ctx.args()) {
-            if ("--slim".equalsIgnoreCase(arg)) {
-                slim = true;
-                break;
-            }
-        }
-        String skinValue;
-        switch (option.toLowerCase()) {
-            case "@none":
-                skinValue = null;
-                break;
-            case "@mirror":
-                if (ctx.sender() instanceof Player player) {
-                    skinValue = player.getName();
-                } else {
-                    textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.skin.mirror-only-players", "%prefix% <red>NPC skin type '@mirror' can only be used on player NPCs and by a player.</red>"));
-                    return;
-                }
-                break;
-            default:
-                if (option.startsWith("http://") || option.startsWith("https://")) {
-                    skinValue = "url:" + option; // e.g., url:http://example.com/skin.png
-                } else if (option.contains("/")) {
-                    skinValue = "file:" + option; // e.g., file:/path/to/skin.png
-                } else if (option.length() > 16 && option.matches("[a-fA-F0-9_]")) {
-                    skinValue = "name:" + option; // assume player name
-                } else {
-                    skinValue = null; // Invalid skin type
-                    textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.skin.invalid", "%prefix% <red>Invalid skin type '%skin_type%'. Valid types are: @none, @mirror, name, url, file.</red>").replace("%skin_type%", option));
-                    return;
-                }
-        }
-        if (skinValue == null) return;
-        String finalValue = (slim ? "slim:" : "classic:") + skinValue;
-        npcManager.modify(id, npc -> { npc.setSkin(finalValue); return npc; });
-        npcManager.save();
-        textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.skin.success", "%prefix% <green>NPC '%name%' skin set to '%skin_value%'.</green>").replace("%name%", id).replace("%skin_value%", finalValue + " (slim: " + slim + ")"));
-    }
-
-    private void handleEquipment(CommandContext ctx) {
-        if (ctx.args().length < 2) {
-            textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.equipment.usage", "%prefix% <red>Usage: /npc equipment (npc) [list | set <slot> <item> | clear]</red>"));
-            return;
-        }
-        String id = ctx.args()[0];
-        NPC npc = npcManager.getNpcs().get(id);
-        if (npc == null) {
-            textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.equipment.not-found", "%prefix% <red>NPC '%name%' not found.</red>").replace("%name%", id));
-            return;
-        }
-        Entity ent = npc.getEntity();
-        if (ent == null) {
-            textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.equipment.not-spawned", "%prefix% <red>NPC '%name%' is not spawned in the world.</red>").replace("%name%", id));
-            return;
-        }
-        if (!(ent instanceof org.bukkit.entity.LivingEntity livingEntity)) {
-            textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.equipment.not-living-entity", "%prefix% <red>NPC '%name%' is not a living entity and cannot have equipment.</red>").replace("%name%", id));
-            return;
-        }
-        EntityEquipment eq = livingEntity.getEquipment();
-        if (eq == null) {
-            textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.equipment.no-equipment", "%prefix% <red>NPC '%name%'s equipment is null.</red>").replace("%name%", id));
-            return;
-        }
-        String sub = ctx.args()[1].toLowerCase();
-        switch (sub) {
-            case "list": {
-                //Check if equipment is all empty:
-                if (eq.getItemInMainHand().getType().isAir() && eq.getItemInOffHand().getType().isAir() && eq.getHelmet().getType().isAir() && eq.getChestplate().getType().isAir() && eq.getLeggings().getType().isAir() && eq.getBoots().getType().isAir()) {
-                    textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.equipment.list.empty", "%prefix% <yellow>NPC '%name%' has no equipment set.</yellow>").replace("%name%", id));
-                    return;
-                }
-                for (String line : plugin.getMessagesFile().getStringList("commands.npc.equipment.list.header")) {
-                    line = line.replace("%name%", id);
-                    textManager.send(ctx.sender(), line);
-                }
-                textManager.send(ctx.sender(), plugin.getMessagesFile().getString("list.line", "<gold>│</gold>  <gray>%slot%: %item%</gray>")
-                        .replace("%slot%", "Helmet")
-                        .replace("%item%", !eq.getItemInMainHand().getType().isAir() ? eq.getItemInMainHand().getType().name() : "None")
-                );
-                textManager.send(ctx.sender(), plugin.getMessagesFile().getString("list.line", "<gold>│</gold>  <gray>%slot%: %item%</gray>")
-                        .replace("%slot%", "Offhand")
-                        .replace("%item%", !eq.getItemInOffHand().getType().isAir() ? eq.getItemInOffHand().getType().name() : "None")
-                );
-                textManager.send(ctx.sender(), plugin.getMessagesFile().getString("list.line", "<gold>│</gold>  <gray>%slot%: %item%</gray>")
-                        .replace("%slot%", "Helmet")
-                        .replace("%item%", !eq.getHelmet().getType().isAir() ? eq.getHelmet().getType().name() : "None")
-                );
-                textManager.send(ctx.sender(), plugin.getMessagesFile().getString("list.line", "<gold>│</gold>  <gray>%slot%: %item%</gray>")
-                        .replace("%slot%", "Chestplate")
-                        .replace("%item%", !eq.getChestplate().getType().isAir() ? eq.getChestplate().getType().name() : "None")
-                );
-                textManager.send(ctx.sender(), plugin.getMessagesFile().getString("list.line", "<gold>│</gold>  <gray>%slot%: %item%</gray>")
-                        .replace("%slot%", "Leggings")
-                        .replace("%item%", !eq.getLeggings().getType().isAir() ? eq.getLeggings().getType().name() : "None")
-                );
-                textManager.send(ctx.sender(), plugin.getMessagesFile().getString("list.line", "<gold>│</gold>  <gray>%slot%: %item%</gray>")
-                        .replace("%slot%", "Boots")
-                        .replace("%item%", !eq.getBoots().getType().isAir() ? eq.getBoots().getType().name() : "None")
-                );
-                for (String line : plugin.getMessagesFile().getStringList("commands.npc.equipment.list.footer")) {
-                    line = line.replace("%name%", id);
-                    textManager.send(ctx.sender(), line);
-                }
-                break;
-            }
-            case "clear": {
-                eq.setItemInMainHand(null);
-                eq.setItemInOffHand(null);
-                eq.setHelmet(null);
-                eq.setChestplate(null);
-                eq.setLeggings(null);
-                eq.setBoots(null);
-                textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.equipment.clear-success", "%prefix% <green>Cleared all equipment of NPC '%name%'.</green>").replace("%name%", id));
-                break;
-            }
-            case "set": {
-                if (ctx.args().length < 4) {
-                    textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.equipment.usage", "%prefix% <red>Usage: /npc equipment set <slot> <item></red>"));
-                    return;
-                }
-                String slot = ctx.args()[2].toLowerCase();
-                String itemName = ctx.args()[3].toUpperCase();
-                Material mat = Material.matchMaterial(itemName);
-                if (mat == null) {
-                    textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.equipment.invalid-material", "%prefix% <red>Invalid material '%material%'.</red>").replace("%material%", itemName));
-                    return;
-                }
-                ItemStack item = new ItemStack(mat);
-                switch (slot) {
-                    case "mainhand":
-                    case "hand":
-                        eq.setItemInMainHand(item);
-                        textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.equipment.set-success", "%prefix% <green>NPC '%name%' equipment slot %slot% set to %material%.</green>").replace("%name%", id).replace("%slot%", "MAINHAND").replace("%material%", mat.name()));
-                        break;
-                    case "offhand":
-                        eq.setItemInOffHand(item);
-                        textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.equipment.set-success", "%prefix% <green>NPC '%name%' equipment slot %slot% set to %material%.</green>").replace("%name%", id).replace("%slot%", "OFFHAND").replace("%material%", mat.name()));
-                        break;
-                    case "helmet":
-                        eq.setHelmet(item);
-                        textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.equipment.set-success", "%prefix% <green>NPC '%name%' equipment slot %slot% set to %material%.</green>").replace("%name%", id).replace("%slot%", "HELMET").replace("%material%", mat.name()));
-                        break;
-                    case "chestplate":
-                        eq.setChestplate(item);
-                        textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.equipment.set-success", "%prefix% <green>NPC '%name%' equipment slot %slot% set to %material%.</green>").replace("%name%", id).replace("%slot%", "CHESTPLATE").replace("%material%", mat.name()));
-                        break;
-                    case "leggings":
-                        eq.setLeggings(item);
-                        textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.equipment.set-success", "%prefix% <green>NPC '%name%' equipment slot %slot% set to %material%.</green>").replace("%name%", id).replace("%slot%", "LEGGINGS").replace("%material%", mat.name()));
-                        break;
-                    case "boots":
-                        eq.setBoots(item);
-                        textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.equipment.set-success", "%prefix% <green>NPC '%name%' equipment slot %slot% set to %material%.</green>").replace("%name%", id).replace("%slot%", "BOOTS").replace("%material%", mat.name()));
-                        break;
-                    default:
-                        textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.equipment.invalid-slot", "%prefix% <red>Invalid equipment slot '%slot%'. Valid slots are: %valid_slots%</red>").replace("%slot%", slot).replace("%valid_slots%", "mainhand, offhand, helmet, chestplate, leggings, boots"));
-                        return;
-                }
-                break;
-            }
-            default:
-                textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.equipment.usage", "%prefix% <red>Usage: /npc equipment (npc) (set | clear | list)</red>"));
-        }
-    }
-
-
-    private void handleGlowing(CommandContext ctx) {
-        if (ctx.args().length < 2) {
-            textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.glowing.usage", "%prefix% <red>Usage: /npc glowing (npc) [disabled | color]</red>"));
-            return;
-        }
-        String id = ctx.args()[0];
-        NPC npc = npcManager.getNpcs().get(id);
-        if (npc == null) {
-            textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.glowing.not-found", "%prefix% <red>NPC '%name%' not found.</red>").replace("%name%", id));
-            return;
-        }
-        String option = ctx.args()[1].toLowerCase();
-        if (option.equalsIgnoreCase("disabled")) {
-            npcManager.modify(id, npcBuilder -> {
-                npcBuilder.setGlowing(false);
-                return npcBuilder;
-            });
-            textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.glowing.success", "%prefix% <green>NPC '%name%' glowing effect set to '%state%'.</green>").replace("%name%", id).replace("%state%", "disabled"));
-        } else {
-            ChatColor color;
-            try {
-                color = ChatColor.valueOf(option.toUpperCase());
-            } catch (IllegalArgumentException e) {
-                textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.glowing.invalid-color", "%prefix% <red>Invalid color '%color%'. Available colors: %valid_colors%</red>")
-                        .replace("%color%", option)
-                        .replace("%valid_colors%", Arrays.stream(ChatColor.values()).filter(ChatColor::isColor).map(Enum::name).collect(Collectors.joining(", "))));
-                return;
-            }
-            npcManager.modify(id, npcBuilder -> {
-                npcBuilder.setGlowing(true);
-                npcBuilder.setGlowColor(color);
-                return npcBuilder;
-            });
-            textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.glowing.success", "%prefix% <green>NPC '%name%' glowing effect set to '%state%'.</green>").replace("%name%", id).replace("%state%", color.name()));
-        }
-    }
-
-    private void handleShowInTab(CommandContext ctx) {
-        if (ctx.args().length < 2) {
-            textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.show_in_tab.usage", "%prefix% <red>Usage: /npc show_in_tab (npc) [true | false]</red>"));
-            return;
-        }
-        if (!ctx.args()[1].equalsIgnoreCase("true") && !ctx.args()[1].equalsIgnoreCase("false")) {
-            textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.show_in_tab.invalid-state", "%prefix% <red>Invalid state '%state%'. Use 'true' or 'false'.</red>").replace("%state%", ctx.args()[1]));
-            return;
-        }
-        String id = ctx.args()[0];
-        NPC npc = npcManager.getNpcs().get(id);
-        if (npc == null) {
-            textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.show_in_tab.not-found", "%prefix% <red>NPC '%name%' not found.</red>").replace("%name%", id));
-            return;
-        }
-        boolean showInTab = Boolean.parseBoolean(ctx.args()[1]);
-        npcManager.modify(id, npcBuilder -> {
-            npcBuilder.setShowInTab(showInTab);
-            return npcBuilder;
-        });
-        npcManager.save();
-        textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.show_in_tab.success", "%prefix% <green>NPC '%name%' show in tab state set to '%state%'.</green>").replace("%name%", id).replace("%state%", String.valueOf(showInTab)));
-    }
-
-    private void handleCollidable(CommandContext ctx) {
-        if (ctx.args().length < 2) {
-            textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.collidable.usage", "%prefix% <red>Usage: /npc collidable (npc) [true | false]</red>"));
-            return;
-        }
-        if (!ctx.args()[1].equalsIgnoreCase("true") && !ctx.args()[1].equalsIgnoreCase("false")) {
-            textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.collidable.invalid-state", "%prefix% <red>Invalid state '%state%'. Use 'true' or 'false'.</red>").replace("%state%", ctx.args()[1]));
-            return;
-        }
-        String id = ctx.args()[0];
-        NPC npc = npcManager.getNpcs().get(id);
-        if (npc == null) {
-            textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.collidable.not-found", "%prefix% <red>NPC '%name%' not found.</red>").replace("%name%", id));
-            return;
-        }
-        boolean col = Boolean.parseBoolean(ctx.args()[1]);
-        npcManager.modify(id, npcBuilder -> { npcBuilder.setCollidable(col); return npcBuilder; });
-        npcManager.save();
-        textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.collidable.success", "%prefix% <green>NPC '%name%' collidable state set to '%state%'.</green>").replace("%name%", id).replace("%state%", String.valueOf(col)));
-    }
-
-    private void handleScale(CommandContext ctx) {
-        if (ctx.args().length < 2) {
-            textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.scale.usage", "%prefix% <red>Usage: /npc scale (npc) <scale></red>"));
-            return;
-        }
-        String id = ctx.args()[0];
-        NPC npc = npcManager.getNpcs().get(id);
-        if (npc == null) {
-            textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.scale.not-found", "%prefix% <red>NPC '%name%' not found.</red>").replace("%name%", id));
-            return;
-        }
-        try {
-            double scale = Double.parseDouble(ctx.args()[1]);
-            if (scale <= 0) {
-                textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.scale.invalid-factor", "%prefix% <red>Scale must be a positive number.</red>"));
-                return;
-            }
-            npcManager.modify(id, npcBuilder -> { npcBuilder.setScale(scale); return npcBuilder; });
-            npcManager.save();
-            textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.scale.success", "%prefix% <green>NPC '%name%' scale set to %scale%.</green>").replace("%name%", id).replace("%scale%", String.valueOf(scale)));
-        } catch (NumberFormatException e) {
-            textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.scale.invalid-factor", "%prefix% <red>Invalid scale value '%value%'.</red>").replace("%value%", ctx.args()[1]));
-        }
-    }
-
-    private void handleAttribute(CommandContext ctx) {
-        if (ctx.args().length < 2) {
-            textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.attribute.usage", "%prefix% <red>Usage: /npc attribute (npc) (list | set <key> <value>)</red>"));
-            return;
-        }
-        String id = ctx.args()[0];
-        String sub = ctx.args()[1];
-        NPC npc = npcManager.getNpcs().get(id);
-        if (npc == null) { textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.attribute.not-found", "%prefix% <red>NPC '%name%' not found.</red>").replace("%name%", id)); return; }
-        if (sub.equalsIgnoreCase("list")) {
-            if (npc.getAttributes().isEmpty()) {
-                textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.attribute.list.empty", "%prefix% <yellow>NPC '%name%' has no attributes.</yellow>").replace("%name%", id));
-            } else {
-                for (String header : plugin.getMessagesFile().getStringList("commands.npc.attribute.list.header")) {
-                    header = header.replace("%name%", id);
-                    textManager.send(ctx.sender(), header);
-                }
-                for (Map.Entry<String, String> entry : npc.getAttributes().entrySet()) {
-                    textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.attribute.list.line", "<gold>│</gold>  <gray>%attribute%: %value%</gray>").replace("%attribute%", entry.getKey()).replace("%value%", entry.getValue()));
-                }
-                for (String footer : plugin.getMessagesFile().getStringList("commands.npc.attribute.list.footer")) {
-                    footer = footer.replace("%name%", id);
-                    textManager.send(ctx.sender(), footer);
-                }
-            }
-            return;
-        } else if (sub.equalsIgnoreCase("set") && ctx.args().length >= 4) {
-            String key = ctx.args()[2], val = ctx.args()[3];
-            npcManager.modify(id, n -> { n.getAttributes().put(key, val); return n; });
-            npcManager.save();
-            textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.attribute.set.success", "%prefix% <green>NPC '%name%' attribute '%attribute%' set to %value%.</green>").replace("%name%", id).replace("%attribute%", key).replace("%value%", val));
-        } else if (sub.equalsIgnoreCase("remove") && ctx.args().length >= 3) {
-            String key = ctx.args()[2];
-            if (npc.getAttributes().remove(key) != null) {
-                npcManager.save();
-                textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.attribute.remove.success", "%prefix% <green>NPC '%name%' attribute '%attribute%' removed successfully.</green>").replace("%name%", id).replace("%attribute%", key));
-            } else {
-                textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.attribute.remove.not-found", "%prefix% <red>NPC '%name%' does not have attribute '%attribute%'.</red>").replace("%name%", id).replace("%attribute%", key));
-            }
-        } else {
-            textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.attribute.usage", "%prefix% <red>Usage: /npc attribute (npc) (list | set <key> <value>)</red>"));
-        }
-    }
-
-    private void handleTurnToPlayer(CommandContext ctx) {
-        if (ctx.args().length < 2) {
-            textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.turn_to_player.usage", "%prefix% <red>Usage: /npc turn_to_player (npc) [true | false]</red>"));
-            return;
-        }
-        String id = ctx.args()[0];
-        NPC npc = npcManager.getNpcs().get(id);
-        if (npc == null) {
-            textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.turn_to_player.not-found", "%prefix% <red>NPC '%name%' not found.</red>").replace("%name%", id));
-            return;
-        }
-        if (!ctx.args()[1].equalsIgnoreCase("true") && !ctx.args()[1].equalsIgnoreCase("false")) {
-            textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.turn_to_player.invalid-state", "%prefix% <red>Invalid state '%state%'. Use 'true' or 'false'.</red>").replace("%state%", ctx.args()[1]));
-            return;
-        }
-        boolean ttp = Boolean.parseBoolean(ctx.args()[1]);
-        npcManager.modify(id, npcBuilder -> { npcBuilder.setTurnToPlayer(ttp); return npcBuilder; });
-        npcManager.save();
-        textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.turn_to_player.success", "%prefix% <green>NPC '%name%' turn to player state set to '%state%'.</green>").replace("%name%", id).replace("%state%", String.valueOf(ttp)));
-    }
-
-    private void handleTurnToPlayerDistance(CommandContext ctx) {
-        if (ctx.args().length < 2) {
-            textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.turn_to_player_distance.usage", "%prefix% <red>Usage: /npc turn_to_player_distance (npc) [distance]</red>"));
-            return;
-        }
-        String id = ctx.args()[0];
-        NPC npc = npcManager.getNpcs().get(id);
-        if (npc == null) {
-            textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.turn_to_player_distance.not-found", "%prefix% <red>NPC '%name%' not found.</red>").replace("%name%", id));
-            return;
-        }
-        try {
-            double d = Double.parseDouble(ctx.args()[1]);
-            if (d < 0) {
-                textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.turn_to_player_distance.invalid-distance", "%prefix% <red>Invalid distance '%distance%'. Must be a positive number.</red>").replace("%distance%", ctx.args()[1]));
-                return;
-            }
-            npcManager.modify(id, npcBuilder -> { npcBuilder.setTurnToPlayerDistance(d); return npcBuilder; });
-            npcManager.save();
-            textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.turn_to_player_distance.success", "%prefix% <green>NPC '%name%' turn to player distance set to %distance% blocks.</green>").replace("%name%", id).replace("%distance%", String.valueOf(d)));
-        } catch (NumberFormatException e) {
-            textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.turn_to_player_distance.invalid-distance", "%prefix% <red>Invalid distance '%distance%'. Must be a number.</red>").replace("%distance%", ctx.args()[1]));
-        }
-    }
-
-    private void handleMoveHere(CommandContext ctx) {
-        if (!(ctx.sender() instanceof Player)) {
-            textManager.send(ctx.sender(), plugin.getMessagesFile().getString("general.only-players", "%prefix% <red>This command can only be used by players.</red>"));
-            return;
-        }
-        if (ctx.args().length < 1) {
-            textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.move_here.usage", "%prefix% <red>Usage: /npc move_here (npc)</red>"));
-            return;
-        }
-        String id = ctx.args()[0];
-        NPC npc = npcManager.getNpcs().get(id);
-        if (npc == null) {
-            textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.move_here.not-found", "%prefix% <red>NPC '%name%' not found.</red>").replace("%name%", id));
-            return;
-        }
-        Location loc = ((Player)ctx.sender()).getLocation();
-        npcManager.modify(id, npcBuilder -> { npcBuilder.setLocation(loc); return npcBuilder; });
-        npcManager.save();
-        textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.move_here.success", "%prefix% <green>NPC '%name%' moved to your current location.</green>").replace("%name%", id));
-    }
-
-    private void handleMoveTo(CommandContext ctx) {
-        if (ctx.args().length < 4) {
-            textManager.send(ctx.sender(), "Usage: /npc move_to <id> <x> <y> <z> [world] [--look-in-my-direction]");
-            return;
-        }
-        String id = ctx.args()[0];
-        NPC npc = npcManager.getNpcs().get(id);
-        if (npc == null) { textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.move_to.not-found", "%prefix% <red>NPC '%name%' not found.</red>").replace("%name%", id)); return; }
-        try {
-            double x = Double.parseDouble(ctx.args()[1]);
-            double y = Double.parseDouble(ctx.args()[2]);
-            double z = Double.parseDouble(ctx.args()[3]);
-            String worldName = ctx.args().length > 4 && !ctx.args()[4].startsWith("--") ? ctx.args()[4] : Bukkit.getWorlds().getFirst().getName();
-            World w = Bukkit.getWorld(worldName);
-            if (w == null) { textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.move_to.invalid-world", "%prefix% <red>World not found.</red>")); return; }
-            Location loc = new Location(w, x, y, z);
-            npcManager.modify(id, npcBuilder -> { npcBuilder.setLocation(loc); return npcBuilder; });
-            npcManager.save();
-            if (ctx.args().length > 4 && "--look-in-my-direction".equalsIgnoreCase(ctx.args()[ctx.args().length-1]) && ctx.sender() instanceof Player) {
-                Location playerLoc = ((Player)ctx.sender()).getLocation();
-                loc.setYaw(playerLoc.getYaw());
-                loc.setPitch(playerLoc.getPitch());
-                npcManager.modify(id, npcBuilder -> { npcBuilder.setLocation(loc); return npc; });
-                npcManager.save();
-            }
-            textManager.send(ctx.sender(),  plugin.getMessagesFile().getString("commands.npc.move_to.success", "%prefix% <green>NPC '%name%' moved to location (%x%, %y%, %z%) in world '%world%'.</green>")
-                    .replace("%name%", id)
-                    .replace("%x%", String.valueOf(x))
-                    .replace("%y%", String.valueOf(y))
-                    .replace("%z%", String.valueOf(z))
-                    .replace("%world%", worldName));
-        } catch (NumberFormatException e) {
-            textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.move_to.invalid-coordinates", "%prefix% <red>Invalid coordinates. Use /npc move_to (npc) x y z [world] [--look-in-my-direction].</red>"));
-            return;
-        }
-    }
-
-    private void handleCenter(CommandContext ctx) {
-        if (ctx.args().length < 1) {
-            textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.center.usage", "%prefix% <red>Usage: /npc center (npc)</red>"));
-            return;
-        }
-        String id = ctx.args()[0];
-        NPC npc = npcManager.getNpcs().get(id);
-        if (npc == null) { textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.center.not-found", "%prefix% <red>NPC '%name%' not found.</red>").replace("%name%", id)); return; }
-        Location l = npc.getLocation();
-        Block b = l.getBlock();
-        Location centered = new Location(b.getWorld(), b.getX()+0.5, b.getY(), b.getZ()+0.5, l.getYaw(), l.getPitch());
-        npcManager.modify(id, n -> { n.setLocation(centered); return n; });
-        npcManager.save();
-        textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.center.success", "%prefix% <green>NPC '%name%' centered to block (%x%, %y%, %z%) in world '%world%'.</green>")
-                .replace("%name%", id));
-    }
-
-    private void handleNearby(CommandContext ctx) {
-        double radius = 10.0; //
-        if (ctx.args().length >= 2 && ctx.args()[0].equalsIgnoreCase("--radius")) {
-            try { radius = Double.parseDouble(ctx.args()[1]); } catch (NumberFormatException ignored) {
-                textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.nearby.invalid-radius", "%prefix% <red>Invalid radius '%radius%'. Must be a positive number.</red>").replace("%radius%", ctx.args()[1]));
-                return;
-            }
-        }
-        double finalRadius = radius;
-        List<NPC> nearby = npcManager.getNpcs().values().stream()
-                .filter(n -> n.getLocation() != null && n.getLocation().distance(((Player)ctx.sender()).getLocation()) <= finalRadius)
-                .sorted(Comparator.comparing(n -> n.getLocation().distance(((Player)ctx.sender()).getLocation())))
-                .toList();
-        if (nearby.isEmpty()) { textManager.send(ctx.sender(), plugin.getMessagesFile().getString("command.npc.nearby.empty", "%prefix% <red>No nearby NPCs found.</red>")); return; }
-        for (String header : plugin.getMessagesFile().getStringList("commands.npc.nearby.header")) {
-            textManager.send(ctx.sender(), header.replace("%radius%", String.valueOf(finalRadius)));
-        }
-        nearby.forEach(n -> textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.nearby.line", "<gold>│</gold>  <hover:show_text:'Click to teleport to %name%'><click:run_command='/npc info %name%'><gray>%id% <yellow>%name%</yellow> <dark_gray>- </dark_gray>%away% blocks away</click></hover>")
-                .replace("%id%", n.getId())
-                .replace("%name%", n.getId())
-                .replace("%away%", String.format("%.2f", n.getLocation().distance(((Player)ctx.sender()).getLocation())))
-        ));
-        for (String footer : plugin.getMessagesFile().getStringList("commands.npc.nearby.footer")) {
-            textManager.send(ctx.sender(), footer.replace("%radius%", String.valueOf(finalRadius)));
-        }
-    }
-
-    private void handleTeleport(CommandContext ctx) {
-        if (!(ctx.sender() instanceof Player) || ctx.args().length < 1) {
-            textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.teleport.usage", "%prefix% <red>Usage: /npc teleport (npc)</red>"));
-            return;
-        }
-        Player p = (Player)ctx.sender();
-        String id = ctx.args()[0];
-        NPC npc = npcManager.getNpcs().get(id);
-        if (npc == null) { textManager.send(p,
-                plugin.getMessagesFile().getString("commands.npc.teleport.not-found", "%prefix% <red>NPC '%name%' not found.</red>").replace("%name%", id)
-                ); return; }
-        p.teleport(npc.getEntity().getLocation());
-        textManager.send(p, plugin.getMessagesFile().getString("commands.npc.teleport.success", "%prefix% <green>Teleported to NPC '%name%' at (%x%, %y%, %z%) in world '%world%'.</green>")
-                .replace("%name%", id)
-                .replace("%x%", String.valueOf(npc.getLocation().getX()))
-                .replace("%y%", String.valueOf(npc.getLocation().getY()))
-                .replace("%z%", String.valueOf(npc.getLocation().getZ()))
-                .replace("%world%", npc.getLocation().getWorld().getName())
-        );
-    }
-
-    private void handleAction(CommandContext ctx) {
-        if (ctx.args().length < 3) {
-            textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.action.usage", "%prefix% <red>Usage: /npc action (npc) add|remove|clear|list [params]</red>"));
-            return;
-        }
-        String id = ctx.args()[0];
-        String sub = ctx.args()[1];
-        NPC npc = npcManager.getNpcs().get(id);
-        if (npc == null) { textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.action.not-found", "%prefix% <red>NPC '%name%' not found.</red>")); return; }
-        switch (sub.toLowerCase()) {
-            case "list":
-                if (npc.getActions().isEmpty()) {
-                    textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.action.list.empty", "%prefix% <yellow>NPC '%name%' has no actions.</yellow>").replace("%name%", id));
-                } else {
-                    for (String header : plugin.getMessagesFile().getStringList("commands.npc.action.list.header")) {
-                        header = header.replace("%name%", id);
-                        textManager.send(ctx.sender(), header);
-                    }
-                    for (String action : npc.getActions()) {
-                        textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.action.list.line", "<gold>│</gold>  <gray>%action%</gray>").replace("%action%", action));
-                    }
-                    for (String footer : plugin.getMessagesFile().getStringList("commands.npc.action.list.footer")) {
-                        footer = footer.replace("%name%", id);
-                        textManager.send(ctx.sender(), footer);
-                    }
-                }
-                break;
-            case "clear":
-                npcManager.modify(id, n -> { n.getActions().clear(); return n; });
-                npcManager.save();
-                textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.action.clear.success", "%prefix% <green>All actions cleared for NPC '%name%'.</green>").replace("%name%", id));
-                break;
-            case "add":
-                String action = ctx.args()[2];
-                npcManager.modify(id, n -> { n.getActions().add(action); return n; });
-                npcManager.save();
-                textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.action.add.success", "%prefix% <green>Action '%action%' added to NPC '%name%'.</green>").replace("%action%", action).replace("%name%", id));
-                break;
-            case "remove":
-                String rem = ctx.args()[2];
-                npcManager.modify(id, n -> { n.getActions().remove(rem); return n; });
-                npcManager.save();
-                textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.action.remove.success", "%prefix% <green>Action '%action%' removed from NPC '%name%'.</green>").replace("%action%", rem).replace("%name%", id));
-                break;
-            default:
-                textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.action.usage", "%prefix% <red>Usage: /npc action (npc) add|remove|clear|list [params]</red>"));
-                break;
-        }
-    }
-
-    private void handleInteractionCooldown(CommandContext ctx) {
-        if (ctx.args().length < 2) {
-            textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.interaction_cooldown.usage", "%prefix% <red>Usage: /npc interaction_cooldown (npc) [disabled | ticks]</red>"));
-            return;
-        }
-        String id = ctx.args()[0];
-        String arg = ctx.args()[1];
-        int ticks = arg.equalsIgnoreCase("disabled") ? 0 : 20; // Default to 20 ticks (1 second) if not specified
-        if (!arg.equalsIgnoreCase("disabled")) {
-            try { ticks = Integer.parseInt(arg); } catch (NumberFormatException e) {
-                textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.interaction_cooldown.invalid-ticks", "%prefix% <red>Invalid duration '%ticks%'. Must be a positive number or 'disabled'.</red>").replace("%ticks%", arg));
-                return;
-            }
-        }
-        int finalTicks = ticks;
-        npcManager.modify(id, n -> { n.setInteractionCooldown(finalTicks); return n; });
-        npcManager.save();
-        textManager.send(ctx.sender(), plugin.getMessagesFile().getString("commands.npc.interaction_cooldown.success", "%prefix% <green>NPC '%name%' interaction cooldown set to %ticks% ticks.</green>")
-                .replace("%name%", id)
-                .replace("%ticks%", finalTicks == 0 ? "disabled" : String.valueOf(finalTicks)));
-    }
-}
diff --git a/src/main/java/gg/nextforge/command/builtin/NextCoreCommand.java b/src/main/java/gg/nextforge/command/builtin/NextCoreCommand.java
index 8d94d02..5e836c3 100644
--- a/src/main/java/gg/nextforge/command/builtin/NextCoreCommand.java
+++ b/src/main/java/gg/nextforge/command/builtin/NextCoreCommand.java
@@ -2,6 +2,13 @@
 
 import gg.nextforge.NextCorePlugin;
 import gg.nextforge.command.CommandContext;
+import net.minecraft.server.MinecraftServer;
+import org.bukkit.Bukkit;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Properties;
+import java.util.stream.Collectors;
 
 public class NextCoreCommand {
 
@@ -18,6 +25,9 @@ private void registerCommands() {
                 .description("NextForge Core Management Command")
                 .executor(this::handleRootCommand)
                 .subcommand("reload", this::handleReloadCommand)
+                .subcommand("version", this::handleVersionCommand)
+                //TODO: implement /nextcore debug command
+                .subcommand("update", this::handleUpdateCommand)
                 .subcommand("info", this::handleInfoCommand)
                 .register();
     }
@@ -32,6 +42,48 @@ private void handleRootCommand(CommandContext context) {
         });
     }
 
+    private void handleVersionCommand(CommandContext context) {
+        String version = plugin.getPluginVersion();
+        plugin.getTextManager().send(context.sender(), plugin.getMessagesFile().getString("commands.nextcore.version.message", "%prefix% <green>NextCore Version: %version%</green> <gray>(%commit%)</gray>").replace("%version%", version).replace("%commit%", plugin.getUpdater().getCurrentGitCommit() != null ? plugin.getUpdater().getCurrentGitCommit() : "Unknown"));
+    }
+
+    private void handleUpdateCommand(CommandContext context) {
+
+        if (context.args().length >= 1 && "download".equalsIgnoreCase(context.args()[1])) {
+            try {
+                if (plugin.getUpdater().isLatestVersion()) {
+                    plugin.getTextManager().send(context.sender(), plugin.getMessagesFile().getString("commands.nextcore.update.up_to_date", "%prefix% <green>You are using the latest version of NextCore.</green>"));
+                    return;
+                }
+                plugin.getTextManager().send(context.sender(), plugin.getMessagesFile().getString("commands.nextcore.update.download.start", "%prefix% <yellow>Starting download of NextCore update...</yellow>"));
+                plugin.getUpdater().downloadLatestJar("dev".equalsIgnoreCase(plugin.getConfigFile().getString("updater.update_branch", "master"))).thenAccept(file -> {
+                    plugin.getTextManager().send(context.sender(), plugin.getMessagesFile().getString("commands.nextcore.update.download.success", "%prefix% <green>Update downloaded successfully. Restart the server to apply the update.</green>"));
+                    plugin.getSLF4JLogger().info("NextCore updated to the latest version: {}", file.getName());
+                }).exceptionally(e -> {
+                    plugin.getSLF4JLogger().error("Failed to download the latest version", e);
+                    plugin.getTextManager().send(context.sender(), plugin.getMessagesFile().getString("commands.nextcore.update.download.error", "%prefix% <red>Error downloading update: %error%</red>").replace("%error%", e.getMessage()));
+                    return null;
+                });
+            } catch (IOException e) {
+                plugin.getSLF4JLogger().error("Failed to download the latest version", e);
+                plugin.getTextManager().send(context.sender(), plugin.getMessagesFile().getString("commands.nextcore.update.error", "%prefix% <red>Error checking for updates: %error%</red>").replace("%error%", e.getMessage()));
+            }
+            return;
+        }
+
+        plugin.getUpdater().checkForUpdates().thenAccept(updateAvailable -> {
+            if (updateAvailable) {
+                plugin.getTextManager().send(context.sender(), plugin.getMessagesFile().getString("commands.nextcore.update.available", "%prefix% <green>An update is available! Version: %version% - Do you want to download it? Run /nextcore update download</green>").replace("%version%", plugin.getUpdater().getLatestVersion()));
+            } else {
+                plugin.getTextManager().send(context.sender(), plugin.getMessagesFile().getString("commands.nextcore.update.up_to_date", "%prefix% <green>You are using the latest version of NextCore.</green>"));
+            }
+        }).exceptionally(e -> {
+            plugin.getSLF4JLogger().error("Failed to check for updates", e);
+            plugin.getTextManager().send(context.sender(), plugin.getMessagesFile().getString("commands.nextcore.update.error", "%prefix% <red>Error checking for updates: %error%").replace("%error%", e.getMessage()));
+            return null;
+        });
+    }
+
     private void handleReloadCommand(CommandContext context) {
         long start = System.currentTimeMillis();
         try {
@@ -47,9 +99,67 @@ private void handleReloadCommand(CommandContext context) {
     }
 
     private void handleInfoCommand(CommandContext context) {
-        context.replyMini("<gold>╔═════════════</gold> <yellow>Server Information</yellow> <gold>═════════════</gold>");
-        context.replyMini("<gold>║</gold>");
-        context.replyMini("<gold>╚═════════════</gold> <yellow>End of Information</yellow> <gold>═════════════</gold>");
+        File serverProperties = plugin.getDataFolder().getParentFile().toPath().resolve("server.properties").toFile();
+        if (!serverProperties.exists()) {
+            plugin.getTextManager().send(context.sender(), plugin.getMessagesFile().getString("commands.nextcore.info.error", "%prefix% <red>Unable to retrieve server information. %error%</red>").replace("%error%", "server.properties file not found."));
+            return;
+        }
+        Properties properties = new Properties();
+        try {
+            properties.load(new java.io.FileInputStream(serverProperties));
+        } catch (java.io.IOException e) {
+            plugin.getTextManager().send(context.sender(), plugin.getMessagesFile().getString("commands.nextcore.info.error", "%prefix% <red>Unable to retrieve server information. %error%</red>").replace("%error%", e.getMessage()));
+            return;
+        }
+        String serverName = properties.getProperty("server-name", "Unknown Server");
+        String serverVersion = Bukkit.getBukkitVersion();
+        int onlinePlayers = Bukkit.getOnlinePlayers().size();
+        int maxPlayers = Bukkit.getMaxPlayers();
+        int sizeOfWorlds = Bukkit.getWorlds().size();
+        int pluginSize = Bukkit.getPluginManager().getPlugins().length;
+        String javaVersion = System.getProperty("java.version");
+        String osName = System.getProperty("os.name");
+        long uptime = System.currentTimeMillis() - plugin.getServerUptime();
+        long memoryUsedMB = (Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory()) / (1024 * 1024);
+        long tps = MinecraftServer.getServer().recentTps[0] > 0 ? (long) MinecraftServer.getServer().recentTps[0] : 20;
+        String formattedTps = formatTps(tps);
+        boolean debugMode = plugin.getConfigFile().getBoolean("debug_mode", false); //TODO: implement debug mode
+        String debugStatus = debugMode ? "<green>Enabled</green>" : "<red>Disabled</red>";
+        String version = plugin.getUpdater().getCurrentVersion();
+        String authors = String.join(", ", plugin.getDescription().getAuthors());
+
+        plugin.getMessagesFile().getStringList("commands.nextcore.info.message").forEach(line -> {
+            line = line.replace("%prefix%", plugin.getMessagesFile().getString("general.prefix", "<dark_gray>[<gradient:aqua:dark_aqua>ɴᴇxᴛᴄᴏʀᴇ<dark_gray>]</gradient></dark_gray>"));
+            line = line.replace("%server_name%", serverName);
+            line = line.replace("%server_version%", serverVersion);
+            line = line.replace("%online_players%", String.valueOf(onlinePlayers));
+            line = line.replace("%max_players%", String.valueOf(maxPlayers));
+            line = line.replace("%worlds%", String.valueOf(sizeOfWorlds));
+            line = line.replace("%plugins%", String.valueOf(pluginSize));
+            line = line.replace("%java_version%", javaVersion);
+            line = line.replace("%os%", osName);
+            line = line.replace("%uptime%", String.format("%d days, %d hours, %d minutes, %d seconds", uptime / (1000 * 60 * 60 * 24), (uptime / (1000 * 60 * 60)) % 24, (uptime / (1000 * 60)) % 60, (uptime / 1000) % 60));
+            line = line.replace("%memory_usage%", String.valueOf(memoryUsedMB));
+            line = line.replace("%tps%", formattedTps);
+            line = line.replace("%debug_mode%", debugStatus);
+            line = line.replace("%nextcore_version%", version);
+            line = line.replace("%authors%", authors);
+            context.replyMini(line);
+        });
+    }
+
+    private String formatTps(long tps) {
+        String[] tpsColors = {"<red>", "<yellow>", "<green>"};
+        if (tps < 0) {
+            return "<red>Invalid TPS";
+        }
+        if (tps < 10) {
+            return tpsColors[0] + String.format("%.2f", tps);
+        } else if (tps < 18) {
+            return tpsColors[1] + String.format("%.2f", tps);
+        } else {
+            return tpsColors[2] + String.format("%.2f", tps);
+        }
     }
 
 }
diff --git a/src/main/java/gg/nextforge/npc/NPCManager.java b/src/main/java/gg/nextforge/npc/NPCManager.java
index 03b9347..390fa84 100644
--- a/src/main/java/gg/nextforge/npc/NPCManager.java
+++ b/src/main/java/gg/nextforge/npc/NPCManager.java
@@ -81,16 +81,6 @@ public void register(NPC npc) {
         spawn(npc);
     }
 
-    /**
-     * Registers a new NPC using a builder.
-     *
-     * @param builder The NPC builder instance.
-     */
-    public void register(NPC.NPCBuilder builder) {
-        NPC npc = builder.build();
-        register(npc);
-    }
-
     /**
      * Modifies an existing NPC using a provided modifier function.
      *
diff --git a/src/main/java/gg/nextforge/updater/CoreAutoUpdater.java b/src/main/java/gg/nextforge/updater/CoreAutoUpdater.java
index 242893e..b5358cf 100644
--- a/src/main/java/gg/nextforge/updater/CoreAutoUpdater.java
+++ b/src/main/java/gg/nextforge/updater/CoreAutoUpdater.java
@@ -4,6 +4,7 @@
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
+import lombok.Getter;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -14,7 +15,9 @@
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.nio.file.Files;
+import java.util.Properties;
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionStage;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.regex.Matcher;
@@ -34,7 +37,10 @@ public class CoreAutoUpdater {
 
     private final Gson gson = new Gson();
     private final File downloadDir;
+    @Getter
     private final String currentVersion;
+    @Getter
+    private String currentGitCommit;
 
     /**
      * Creates an updater using the version specified in {@code plugin.yml}
@@ -58,6 +64,26 @@ public CoreAutoUpdater(String currentVersion, File downloadDir) {
         this.downloadDir = downloadDir;
     }
 
+    /**
+     * Loads the current Git commit ID from the `git.properties` file.
+     * This file is typically generated by the build process
+     * and contains information about the current Git commit.
+     */
+    private void loadGitCommit() {
+        try (InputStream in = getClass().getClassLoader()
+                .getResourceAsStream("git.properties")) {
+            if (in != null) {
+                Properties props = new Properties();
+                props.load(in);
+                String commit = props.getProperty("git.commit.id", "unknown");
+                this.currentGitCommit = commit;
+            }
+        } catch (IOException e) {
+            LOGGER.log(Level.WARNING, "Failed to read git.properties", e);
+            this.currentGitCommit = "unknown";
+        }
+    }
+
     private String readVersionFromPlugin() {
         Pattern p = Pattern.compile("^version:\\s*(.+)$");
         try (InputStream in = getClass().getClassLoader().getResourceAsStream("plugin.yml")) {
@@ -235,4 +261,24 @@ private File downloadFile(String url, String name) throws IOException {
         }
         return out;
     }
+
+    public CompletableFuture<Boolean> checkForUpdates() {
+        return CompletableFuture.supplyAsync(() -> {
+            try {
+                return !isLatestVersion();
+            } catch (IOException e) {
+                LOGGER.log(Level.SEVERE, "Failed to check for updates", e);
+                return false;
+            }
+        });
+    }
+
+    public String getLatestVersion() {
+        try {
+            return fetchLatestVersion();
+        } catch (IOException e) {
+            LOGGER.log(Level.SEVERE, "Failed to fetch latest version", e);
+            return null;
+        }
+    }
 }
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
index 1742ffd..c5aa1e7 100644
--- a/src/main/resources/config.yml
+++ b/src/main/resources/config.yml
@@ -2,4 +2,31 @@ updater:
   auto_update: true # Enable automatic updates
   check_interval: 7200000 # Check for updates every 2 hours (in milliseconds)
   update_branch: 'master' # Branch to check for updates | Available branches: master, dev
-  disable_update_message: false # Disable the update message in the console
\ No newline at end of file
+  disable_update_message: false # Disable the update message in the console
+debug:
+  enabled: false # Enable debug mode - This will log additional information to the console and saves it to an option below
+  log:
+    file:
+      enabled: true # Enable logging to a file
+      file_path: 'plugins/NextCore/debug_logs/debug.log' # Path to the debug log file
+    paste-service:
+      enabled: true # Enable logging to a paste service
+      service_url: 'https://paste.example.com/api' # URL of the paste service
+      max_size: 1048576 # Maximum size of the log file to be uploaded (in bytes) - 1 MB default
+commands:
+    nextcore:
+        permission: 'nextcore.command' # Permission required to use the /nextcore command
+        aliases: # Aliases for the /nextcore command
+        - 'nc'
+        - 'ncore'
+        subcommands: # Subcommands for the /nextcore command
+        reload:
+            permission: 'nextcore.command.reload' # Permission for the reload subcommand
+        version:
+            permission: 'nextcore.command.version' # Permission for the version subcommand
+        debug:
+            permission: 'nextcore.command.debug' # Permission for the debug subcommand
+        update:
+            permission: 'nextcore.command.update' # Permission for the update subcommand
+        info:
+            permission: 'nextcore.command.info' # Permission for the info subcommand
\ No newline at end of file
diff --git a/src/main/resources/messages.yml b/src/main/resources/messages.yml
index d0f70c3..8d36300 100644
--- a/src/main/resources/messages.yml
+++ b/src/main/resources/messages.yml
@@ -6,245 +6,53 @@ general:
 commands:
   nextcore:
     help:
-      - "<gold>┌─────────────</gold> <yellow>NextCore Help</yellow> <gold>─────────────</gold>"
+      - "<gold>┌────────────</gold> <yellow>NextCore Help</yellow> <gold>────────────</gold>"
       - "<gold>│</gold>"
       - "<gold>│</gold>  <gray>/nextcore <yellow>reload</yellow><dark_gray> - </dark_gray>Reloads the NextCore configuration"
       - "<gold>│</gold>  <gray>/nextcore <yellow>version</yellow><dark_gray> - </dark_gray>Displays the NextCore version"
       - "<gold>│</gold>  <gray>/nextcore <yellow>debug</yellow><dark_gray> - </dark_gray>Toggles debug mode for NextCore"
       - "<gold>│</gold>  <gray>/nextcore <yellow>update</yellow><dark_gray> - </dark_gray>Checks for updates to NextCore"
       - "<gold>│</gold>  <gray>/nextcore <yellow>info</yellow><dark_gray> - </dark_gray>Get server information"
-      - "<gold>│</gold>  <gray>/nextcore <yellow>test</yellow><dark_gray> - </dark_gray>Run test commands"
-      - "<gold>│</gold>  <gray>/nextcore <yellow>managers</yellow><dark_gray> - </dark_gray>See the managers doing their job"
       - "<gold>│</gold>  <gray>/nextcore <yellow>help</yellow><dark_gray> - </dark_gray>Displays this help message"
       - "<gold>│</gold>"
       - "<gold>│</gold>  <gray>Made by <gold>%author%</gold> | <gold>Version: %version%</gold></gray>"
       - "<gold>│</gold>"
-      - "<gold>└─────────────</gold> <yellow>NextCore Help</yellow> <gold>─────────────</gold>"
+      - "<gold>└────────────</gold> <yellow>NextCore Help</yellow> <gold>────────────</gold>"
     reload:
       success: "%prefix% <green>Configuration reloaded successfully.</green> <gray>(%time%ms)</gray>"
       error: "%prefix% <red>Failed to reload configuration: %error%</red>"
-  npc:
-    help:
-      header:
-        - "<gold>┌───────────</gold> <yellow>NPCManager (%page%/%max%)</yellow> <gold>───────────</gold>"
-        - "<gold>│</gold>"
-      footer:
-        - "<gold>│</gold>"
-        - "<gold>└───────────</gold> <yellow>NPCManager (%page%/%max%)</yellow> <gold>───────────</gold>"
-      lines:
-        - "<gold>│</gold>  <gray>/npc <yellow>help [page]</yellow> <dark_gray>- </dark_gray>Displays this help message"
-        - "<gold>│</gold>  <gray>/npc <yellow>create (name)</yellow> <dark_gray>- </dark_gray>Create a new NPC with the given name"
-        - "<gold>│</gold>  <gray>/npc <yellow>copy (npc) (new_name)</yellow> <dark_gray>- </dark_gray>Copy an existing NPC"
-        - "<gold>│</gold>  <gray>/npc <yellow>remove (npc)</yellow> <dark_gray>- </dark_gray>Remove an NPC"
-        - "<gold>│</gold>  <gray>/npc <yellow>list [page]</yellow> <dark_gray>- </dark_gray>List NPCs"
-        - "<gold>│</gold>  <gray>/npc <yellow>info (npc)</yellow> <dark_gray>- </dark_gray>Show NPC info"
-        - "<gold>│</gold>  <gray>/npc <yellow>type (npc) (type)</yellow> <dark_gray>- </dark_gray>Set NPC type"
-        - "<gold>│</gold>  <gray>/npc <yellow>displayname (npc) (@none | name)</yellow> <dark_gray>- </dark_gray>Set or clear NPC display name"
-        - "<gold>│</gold>  <gray>/npc <yellow>skin (npc) (@none | @mirror | name | url | file) [--slim]</yellow> <dark_gray>- </dark_gray>Set NPC skin"
-        - "<gold>│</gold>  <gray>/npc <yellow>equipment (npc) (set | clear | list)</yellow> <dark_gray>- </dark_gray>Manage NPC equipment"
-        - "<gold>│</gold>  <gray>/npc <yellow>glowing (npc) [disabled | color]</yellow> <dark_gray>- </dark_gray>Set NPC glowing effect"
-        - "<gold>│</gold>  <gray>/npc <yellow>show_in_tab (npc) [state]</yellow> <dark_gray>- </dark_gray>Show/hide NPC in tab list"
-        - "<gold>│</gold>  <gray>/npc <yellow>collidable (npc) [state]</yellow> <dark_gray>- </dark_gray>Set NPC collidable state"
-        - "<gold>│</gold>  <gray>/npc <yellow>scale (npc) factor</yellow> <dark_gray>- </dark_gray>Set NPC scale"
-        - "<gold>│</gold>  <gray>/npc <yellow>attribute (npc) (set | remove | list)</yellow> <dark_gray>- </dark_gray>Manage NPC attributes"
-        - "<gold>│</gold>  <gray>/npc <yellow>turn_to_player (npc) [state]</yellow> <dark_gray>- </dark_gray>Toggle NPC turn to player"
-        - "<gold>│</gold>  <gray>/npc <yellow>turn_to_player_distance (npc) [distance]</yellow> <dark_gray>- </dark_gray>Set turn to player distance"
-        - "<gold>│</gold>  <gray>/npc <yellow>move_here (npc)</yellow> <dark_gray>- </dark_gray>Move NPC to your location"
-        - "<gold>│</gold>  <gray>/npc <yellow>move_to (npc) x y z [world] [--look-in-my-direction]</yellow> <dark_gray>- </dark_gray>Move NPC to coordinates"
-        - "<gold>│</gold>  <gray>/npc <yellow>center (npc)</yellow> <dark_gray>- </dark_gray>Center NPC on block"
-        - "<gold>│</gold>  <gray>/npc <yellow>nearby [--radius radius] [--type type] [--sort sort]</yellow> <dark_gray>- </dark_gray>List nearby NPCs"
-        - "<gold>│</gold>  <gray>/npc <yellow>teleport (npc)</yellow> <dark_gray>- </dark_gray>Teleport to NPC"
-        - "<gold>│</gold>  <gray>/npc <yellow>action (npc) (trigger) add|add_before|add_after|set|remove|move_up|move_down|clear|list [params]</yellow> <dark_gray>- </dark_gray>Manage NPC actions"
-        - "<gold>│</gold>  <gray>/npc <yellow>interaction_cooldown (npc) [disabled | duration]</yellow> <dark_gray>- </dark_gray>Set NPC interaction cooldown"
-      invalid-page: "%prefix% <red>Invalid page number. Use /npc help to see available pages.</red>"
-    create:
-      usage: "%prefix% <red>Usage: /npc create (name)</red>"
-      already-exists: "%prefix% <red>An NPC with the name '%name%' already exists.</red>"
-      success: "%prefix% <green>NPC '%name%' created successfully at your location.</green>"
-    copy:
-      usage: "%prefix% <red>Usage: /npc copy (npc) (new_name)</red>"
-      not-found: "%prefix% <red>NPC '%name%' not found.</red>"
-      already-exists: "%prefix% <red>An NPC with the name '%new_name%' already exists.</red>"
-      success: "%prefix% <green>NPC '%npc%' copied to '%new_name%' successfully.</green>"
-    remove:
-      usage: "%prefix% <red>Usage: /npc remove (npc)</red>"
-      not-found: "%prefix% <red>NPC '%name%' not found.</red>"
-      success: "%prefix% <green>NPC '%name%' removed successfully.</green>"
-    list:
-      empty: "%prefix% <red>No NPCs found.</red>"
-      headers:
-        - "<gold>┌─────────────</gold> <yellow>NPC List (%page%/%max%)</yellow> <gold>─────────────</gold>"
-        - "<gold>│</gold>"
-      footer:
-        - "<gold>│</gold>"
-        - "<gold>└─────────────</gold> <yellow>NPC List (%page%/%max%)</yellow> <gold>─────────────</gold>"
-      line: "<gold>│</gold>  <hover:show_text:'Click to teleport to %name%'><click:run_command='/npc info %name%'><gray>%id% <yellow>%name%</yellow> <dark_gray>- </dark_gray>%type% <gray>(%skin%)</gray></click></hover>"
+    version:
+      message: "%prefix% <green>NextCore Version: %version%</green> <gray>(%commit%)</gray>"
+    debug:
+      enabled: "%prefix% <green>Debug mode enabled.</green>"
+      disabled: "%prefix% <red>Debug mode disabled.</red>"
+    update:
+      checking: "%prefix% <yellow>Checking for updates...</yellow>"
+      available: "%prefix% <green>An update is available! Version: %version% - Do you want to download it? Run /nextcore update download</green>"
+      up_to_date: "%prefix% <green>You are using the latest version of NextCore.</green>"
+      error: "%prefix% <red>Error checking for updates: %error%</red>"
+      download:
+        start: "%prefix% <yellow>Starting download of NextCore update...</yellow>"
+        success: "%prefix% <green>Update downloaded successfully. Restart the server to apply the update.</green>"
+        error: "%prefix% <red>Error downloading update: %error%</red>"
     info:
-      usage: "%prefix% <red>Usage: /npc info (npc)</red>"
-      not-found: "%prefix% <red>NPC '%name%' not found.</red>"
-      header:
-        - "<gold>┌─────────────</gold> <yellow>NPC Info: %name%</yellow> <gold>─────────────</gold>"
-        - "<gold>│</gold>"
-      footer:
-        - "<gold>│</gold>"
-        - "<gold>└─────────────</gold> <yellow>NPC Info: %name%</yellow> <gold>─────────────</gold>"
-      lines:
-        - "<gold>│</gold>  <gray>ID: %id%</gray>"
-        - "<gold>│</gold>  <gray>Type: %type%</gray>"
-        - "<gold>│</gold>  <gray>Display Name: %display_name%</gray>"
-        - "<gold>│</gold>  <gray>Skin: %skin%</gray>"
-        - "<gold>│</gold>  <gray>Equipment: %equipment%</gray>"
-        - "<gold>│</gold>  <gray>Glowing: %glowing%</gray>"
-        - "<gold>│</gold>  <gray>Show in Tab: %show_in_tab%</gray>"
-        - "<gold>│</gold>  <gray>Collidable: %collidable%</gray>"
-        - "<gold>│</gold>  <gray>Scale: %scale%</gray>"
-        - "<gold>│</gold>  <gray>Turn to Player: %turn_to_player%</gray>"
-        - "<gold>│</gold>  <gray>Turn to Player Distance: %turn_to_player_distance%</gray>"
-        - "<gold>│</gold>  <gray>Transient: %transient%</gray>"
-        - "<gold>│</gold>  <gray>X: %x% Y: %y% Z: %z% World: %world%</gray>"
-      actions:
-        header: "<gold>│</gold>  <gray>Actions:</gray>"
-        empty: "<gold>│</gold>  <gray>No actions defined.</gray>"
-        line: "<gold>│</gold>  <gray>- %action% (%trigger%)</gray>"
-      attributes:
-        header: "<gold>│</gold>  <gray>Attributes:</gray>"
-        empty: "<gold>│</gold>  <gray>No attributes defined.</gray>"
-        line: "<gold>│</gold>  <gray>- %attribute% (%value%)</gray>"
-    type:
-      usage: "%prefix% <red>Usage: /npc type (npc) (type)</red>"
-      not-found: "%prefix% <red>NPC '%name%' not found.</red>"
-      invalid-type: "%prefix% <red>Invalid NPC type '%type%'. Valid types are: %valid_types%</red>"
-      success: "%prefix% <green>NPC '%name%' type set to '%type%'.</green>"
-    displayname:
-      usage: "%prefix% <red>Usage: /npc displayname (npc) (@none | name)</red>"
-      not-found: "%prefix% <red>NPC '%name%' not found.</red>"
-      success-set: "%prefix% <green>NPC '%name%' display name set to '%display_name%'.</green>"
-      success-cleared: "%prefix% <green>NPC '%name%' display name cleared.</green>"
-      invalid-name: "%prefix% <red>Invalid display name '%display_name%'. Use '@none' to clear.</red>"
-    skin:
-      usage: "%prefix% <red>Usage: /npc skin (npc) (@none | @mirror | name | url | file) [--slim]</red>"
-      not-found: "%prefix% <red>NPC '%name%' not found.</red>"
-      success: "%prefix% <green>NPC '%name%' skin set to '%skin%'.</green>"
-      mirror-only-player: "%prefix% <red>NPC skin type '@mirror' can only be used on player NPCs and by a player.</red>"
-      invalid-skin: "%prefix% <red>Invalid skin type '%skin_type%'. Valid types are: @none, @mirror, name, url, file.</red>"
-    equipment:
-        usage: "%prefix% <red>Usage: /npc equipment (npc) (set | clear | list)</red>"
-        not-found: "%prefix% <red>NPC '%name%' not found.</red>"
-        not-spawned: "%prefix% <red>NPC '%name%' must be spawned to manage equipment.</red>"
-        not-living-entity: "%prefix% <red>NPC '%name%' is not a living entity and cannot have equipment.</red>"
-        no-equipment: "%prefix% <red>NPC '%name%'s equipment is null.</red>"
-        set-success: "%prefix% <green>NPC '%name%' equipment slot %slot% set to %material%.</green>"
-        invalid-slot: "%prefix% <red>Invalid equipment slot '%slot%'. Valid slots are: %valid_slots%</red>"
-        invalid-material: "%prefix% <red>Invalid material '%material%'.</red>"
-        clear-success: "%prefix% <green>NPC '%name%' equipment cleared successfully.</green>"
-        list:
-          empty: "%prefix% <red>No equipment items found for NPC '%name%'.</red>"
-          header:
-          - "<gold>┌─────────────</gold> <yellow>Equipment for %name%</yellow> <gold>─────────────</gold>"
-          - "<gold>│</gold>"
-          footer:
-          - "<gold>│</gold>"
-          - "<gold>└─────────────</gold> <yellow>Equipment for %name%</yellow> <gold>─────────────</gold>"
-          line: "<gold>│</gold>  <gray>%slot%: %item%</gray>"
-    glowing:
-      usage: "%prefix% <red>Usage: /npc glowing (npc) [disabled | color]</red>"
-      not-found: "%prefix% <red>NPC '%name%' not found.</red>"
-      invalid-color: "%prefix% <red>Invalid color '%color%'. Available colors: %valid_colors%</red>"
-      success: "%prefix% <green>NPC '%name%' glowing effect set to '%state%'.</green>"
-    show_in_tab:
-      usage: "%prefix% <red>Usage: /npc show_in_tab (npc) [true | false]</red>"
-      not-found: "%prefix% <red>NPC '%name%' not found.</red>"
-      invalid-state: "%prefix% <red>Invalid state '%state%'. Use 'true' or 'false'.</red>"
-      success: "%prefix% <green>NPC '%name%' show in tab state set to '%state%'.</green>"
-    collidable:
-      usage: "%prefix% <red>Usage: /npc collidable (npc) [true | false]</red>"
-      not-found: "%prefix% <red>NPC '%name%' not found.</red>"
-      invalid-state: "%prefix% <red>Invalid state '%state%'. Use 'true' or 'false'.</red>"
-      success: "%prefix% <green>NPC '%name%' collidable state set to '%state%'.</green>"
-    scale:
-      usage: "%prefix% <red>Usage: /npc scale (npc) (factor)</red>"
-      not-found: "%prefix% <red>NPC '%name%' not found.</red>"
-      invalid-factor: "%prefix% <red>Invalid scale factor '%factor%'. Must be a positive number.</red>"
-      success: "%prefix% <green>NPC '%name%' scale set to %factor%.</green>"
-    attribute:
-      usage: "%prefix% <red>Usage: /npc attribute (npc) (set | list)</red>"
-      not-found: "%prefix% <red>NPC '%name%' not found.</red>"
-      list:
-        empty: "%prefix% <red>No attributes found for NPC '%name%'.</red>"
-        header:
-          - "<gold>┌─────────────</gold> <yellow>Attributes for %name%</yellow> <gold>─────────────</gold>"
-          - "<gold>│</gold>"
-        footer:
-          - "<gold>│</gold>"
-          - "<gold>└─────────────</gold> <yellow>Attributes for %name%</yellow> <gold>─────────────</gold>"
-        line: "<gold>│</gold>  <gray>%attribute%: %value%</gray>"
-      set:
-        success: "%prefix% <green>NPC '%name%' attribute '%attribute%' set to %value%.</green>"
-      remove:
-        not-found: "%prefix% <red>NPC '%name%' does not have attribute '%attribute%'.</red>"
-        success: "%prefix% <green>NPC '%name%' attribute '%attribute%' removed successfully.</green>"
-    turn_to_player:
-      usage: "%prefix% <red>Usage: /npc turn_to_player (npc) [true | false]</red>"
-      not-found: "%prefix% <red>NPC '%name%' not found.</red>"
-      invalid-state: "%prefix% <red>Invalid state '%state%'. Use 'true' or 'false'.</red>"
-      success: "%prefix% <green>NPC '%name%' turn to player state set to '%state%'.</green>"
-    turn_to_player_distance:
-      usage: "%prefix% <red>Usage: /npc turn_to_player_distance (npc) [distance]</red>"
-      not-found: "%prefix% <red>NPC '%name%' not found.</red>"
-      invalid-distance: "%prefix% <red>Invalid distance '%distance%'. Must be a positive number.</red>"
-      success: "%prefix% <green>NPC '%name%' turn to player distance set to %distance% blocks.</green>"
-    move_here:
-      usage: "%prefix% <red>Usage: /npc move_here (npc)</red>"
-      not-found: "%prefix% <red>NPC '%name%' not found.</red>"
-      success: "%prefix% <green>NPC '%name%' moved to your current location.</green>"
-    move_to:
-      usage: "%prefix% <red>Usage: /npc move_to (npc) x y z [world] [--look-in-my-direction]</red>"
-      not-found: "%prefix% <red>NPC '%name%' not found.</red>"
-      invalid-world: "%prefix% <red>World not found.</red>"
-      invalid-coordinates: "%prefix% <red>Invalid coordinates. Use /npc move_to (npc) x y z [world] [--look-in-my-direction].</red>"
-      success: "%prefix% <green>NPC '%name%' moved to coordinates (%x%, %y%, %z%) in world '%world%'.</green>"
-      look-in-my-direction: "%prefix% <green>NPC '%name%' will now look in your direction.</green>"
-    center:
-      usage: "%prefix% <red>Usage: /npc center (npc)</red>"
-      not-found: "%prefix% <red>NPC '%name%' not found.</red>"
-      success: "%prefix% <green>NPC '%name%' centered on the block at its current location.</green>"
-    nearby:
-      usage: "%prefix% <red>Usage: /npc nearby [--radius radius]</red>"
-      radius:
-        invalid: "%prefix% <red>Invalid radius '%radius%'. Must be a positive number.</red>"
-      empty: "%prefix% <red>No nearby NPCs found.</red>"
-      headers:
-        - "<gold>┌─────────────</gold> <yellow>Nearby NPCs (%radius%)</yellow> <gold>─────────────</gold>"
-        - "<gold>│</gold>"
-      footer:
-        - "<gold>│</gold>"
-        - "<gold>└─────────────</gold> <yellow>Nearby NPCs (%radius%)</yellow> <gold>─────────────</gold>"
-      line: "<gold>│</gold>  <hover:show_text:'Click to teleport to %name%'><click:run_command='/npc info %name%'><gray>%id% <yellow>%name%</yellow> <dark_gray>- </dark_gray>%away% blocks away</click></hover>"
-    teleport:
-      usage: "%prefix% <red>Usage: /npc teleport (npc)</red>"
-      not-found: "%prefix% <red>NPC '%name%' not found.</red>"
-      success: "%prefix% <green>Teleported to NPC '%name%' at (%x%, %y%, %z%) in world '%world%'.</green>"
-    action:
-      usage: "%prefix% <red>Usage: /npc action (npc) add|remove|clear|list [params]</red>"
-      not-found: "%prefix% <red>NPC '%name%' not found.</red>"
-      add:
-        success: "%prefix% <green>Action '%action%' added to NPC '%name%'.</green>"
-      list:
-        empty: "%prefix% <red>NPC '%name%' has no actions.</red>"
-        header:
-          - "<gold>┌─────────────</gold> <yellow>Actions for %name%</yellow> <gold>─────────────</gold>"
-          - "<gold>│</gold>"
-        footer:
-          - "<gold>│</gold>"
-          - "<gold>└─────────────</gold> <yellow>Actions for %name%</yellow> <gold>─────────────</gold>"
-        line: "<gold>│</gold>  <gray>%action%</gray>"
-      remove:
-        not-found: "%prefix% <red>Action '%action%' not found for NPC '%name%'.</red>"
-        success: "%prefix% <green>Action '%action%' removed from NPC '%name%'.</green>"
-      clear:
-        success: "%prefix% <green>All actions cleared for NPC '%name%'.</green>"
-    interaction_cooldown:
-      usage: "%prefix% <red>Usage: /npc interaction_cooldown (npc) [disabled | duration]</red>"
-      not-found: "%prefix% <red>NPC '%name%' not found.</red>"
-      invalid-ticks: "%prefix% <red>Invalid duration '%ticks%'. Must be a positive number or 'disabled'.</red>"
-      success: "%prefix% <green>NPC '%name%' interaction cooldown set to '%ticks%' ticks.</green>"
\ No newline at end of file
+      message:
+        - "<gold>┌────────────</gold> <yellow>Server Info</yellow> <gold>────────────</gold>"
+        - "<gold>│</gold>"
+        - "<gold>│</gold>  <gray>Server Name: <yellow>%server_name%</yellow></gray>"
+        - "<gold>│</gold>  <gray>Version: <yellow>%server_version%</yellow></gray>"
+        - "<gold>│</gold>  <gray>Online Players: <yellow>%online_players%/%max_players%</yellow></gray>"
+        - "<gold>│</gold>  <gray>Worlds: <yellow>%worlds%</yellow></gray>"
+        - "<gold>│</gold>  <gray>Plugins: <yellow>%plugins%</yellow></gray>"
+        - "<gold>│</gold>  <gray>Java Version: <yellow>%java_version%</yellow></gray>"
+        - "<gold>│</gold>  <gray>OS: <yellow>%os%</yellow></gray>"
+        - "<gold>│</gold>  <gray>Uptime: <yellow>%uptime%</yellow></gray>"
+        - "<gold>│</gold>  <gray>Memory: <yellow>%memory_usage%</yellow></gray>"
+        - "<gold>│</gold>  <gray>TPS: <yellow>%tps%</yellow></gray>"
+        - "<gold>│</gold>  <gray>Debug Mode: <yellow>%debug_mode%</yellow></gray>"
+        - "<gold>│</gold>  <gray>NextCore Version: <yellow>%nextcore_version%</yellow></gray>"
+        - "<gold>│</gold>"
+        - "<gold>│</gold>  <gray>Made by <gold>%authors%</gold></gray>"
+        - "<gold>│</gold>"
+        - "<gold>└────────────</gold> <yellow>Server Info</yellow> <gold>────────────</gold>"
+      error: "%prefix% <red>Unable to retrieve server information. %error%</red>"
\ No newline at end of file