diff --git a/gradle.properties b/gradle.properties
index 8247c7d..6de1f1c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,7 +4,7 @@ mcVersion=1.21.8
 release=2
 # 0 for skip release, 1 for pre-release, 2 for release
 
-luminolRef=fa4e778f2ab92b0ccef57fad830660766b3f2f18
+luminolRef=a3bc02dca9dba9ee552e9ee03bad3253c1707f88
 
 org.gradle.configuration-cache=true
 org.gradle.caching=true
diff --git a/lophine-server/minecraft-patches/features/0005-Add-config-to-enable-raytracing-tracker.patch b/lophine-server/minecraft-patches/features/0004-Add-config-to-enable-raytracing-tracker.patch
similarity index 100%
rename from lophine-server/minecraft-patches/features/0005-Add-config-to-enable-raytracing-tracker.patch
rename to lophine-server/minecraft-patches/features/0004-Add-config-to-enable-raytracing-tracker.patch
diff --git a/lophine-server/minecraft-patches/features/0004-Add-config-to-enable-datapack-command.patch b/lophine-server/minecraft-patches/features/0005-Add-config-to-enable-datapack-command.patch
similarity index 100%
rename from lophine-server/minecraft-patches/features/0004-Add-config-to-enable-datapack-command.patch
rename to lophine-server/minecraft-patches/features/0005-Add-config-to-enable-datapack-command.patch
diff --git a/lophine-server/minecraft-patches/features/0006-Add-config-to-enable-function-command.patch b/lophine-server/minecraft-patches/features/0006-Add-config-to-enable-function-command.patch
new file mode 100644
index 0000000..f9f1c3d
--- /dev/null
+++ b/lophine-server/minecraft-patches/features/0006-Add-config-to-enable-function-command.patch
@@ -0,0 +1,21 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Helvetica Volubi <suisuroru@blue-millennium.fun>
+Date: Thu, 4 Sep 2025 02:14:16 +0800
+Subject: [PATCH] Add config to enable function command
+
+
+diff --git a/net/minecraft/commands/Commands.java b/net/minecraft/commands/Commands.java
+index af895859057ca303177ec3c8a07cf7534e62cca6..e0e9fcf3224f55f2ef31c8afca3154a5992f761b 100644
+--- a/net/minecraft/commands/Commands.java
++++ b/net/minecraft/commands/Commands.java
+@@ -206,7 +206,9 @@ public class Commands {
+         FillCommand.register(this.dispatcher, context);
+         FillBiomeCommand.register(this.dispatcher, context);
+         ForceLoadCommand.register(this.dispatcher);
+-        //FunctionCommand.register(this.dispatcher); // Folia - region threading - TODO
++        if (fun.bm.lophine.config.modules.experiment.CommandConfig.function) {
++            FunctionCommand.register(this.dispatcher); // Folia - region threading - TODO
++        }
+         GameModeCommand.register(this.dispatcher);
+         GameRuleCommand.register(this.dispatcher, context);
+         GiveCommand.register(this.dispatcher, context);
diff --git a/lophine-server/minecraft-patches/features/0006-Add-config-to-enable-tick-command.patch b/lophine-server/minecraft-patches/features/0007-Add-config-to-enable-tick-command.patch
similarity index 98%
rename from lophine-server/minecraft-patches/features/0006-Add-config-to-enable-tick-command.patch
rename to lophine-server/minecraft-patches/features/0007-Add-config-to-enable-tick-command.patch
index c1d6e06..5918027 100644
--- a/lophine-server/minecraft-patches/features/0006-Add-config-to-enable-tick-command.patch
+++ b/lophine-server/minecraft-patches/features/0007-Add-config-to-enable-tick-command.patch
@@ -97,10 +97,10 @@ index c485d5b3ba95f2a969bdf0dab9654ac284976f8d..b957585cf7cf7f845e20f59c7b355722
                  this.scheduler.regionFailed(this, false, thr);
                  // regionFailed will schedule a shutdown, so we should avoid letting this region tick further
 diff --git a/net/minecraft/commands/Commands.java b/net/minecraft/commands/Commands.java
-index af895859057ca303177ec3c8a07cf7534e62cca6..94a3cea5d42b1f98bbde22ef514f8f7dbd64ba58 100644
+index e0e9fcf3224f55f2ef31c8afca3154a5992f761b..a5b59eb79c014ef7a48ff305ed554fc33a184d87 100644
 --- a/net/minecraft/commands/Commands.java
 +++ b/net/minecraft/commands/Commands.java
-@@ -245,7 +245,11 @@ public class Commands {
+@@ -247,7 +247,11 @@ public class Commands {
          TeleportCommand.register(this.dispatcher);
          TellRawCommand.register(this.dispatcher, context);
          //TestCommand.register(this.dispatcher, context); // Folia - region threading
diff --git a/lophine-server/minecraft-patches/features/0007-Add-config-to-enable-unsafe-waypoint-bar.patch b/lophine-server/minecraft-patches/features/0008-Add-config-to-enable-waypoint-command-bar.patch
similarity index 81%
rename from lophine-server/minecraft-patches/features/0007-Add-config-to-enable-unsafe-waypoint-bar.patch
rename to lophine-server/minecraft-patches/features/0008-Add-config-to-enable-waypoint-command-bar.patch
index 3f78111..917227d 100644
--- a/lophine-server/minecraft-patches/features/0007-Add-config-to-enable-unsafe-waypoint-bar.patch
+++ b/lophine-server/minecraft-patches/features/0008-Add-config-to-enable-waypoint-command-bar.patch
@@ -1,20 +1,20 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Helvetica Volubi <suisuroru@blue-millennium.fun>
 Date: Mon, 7 Jul 2025 18:19:00 +0800
-Subject: [PATCH] Add config to enable unsafe waypoint bar
+Subject: [PATCH] Add config to enable waypoint command & bar
 
 
 diff --git a/net/minecraft/commands/Commands.java b/net/minecraft/commands/Commands.java
-index 94a3cea5d42b1f98bbde22ef514f8f7dbd64ba58..e311977fca4d0ba6e3efd4a41b2732cf5e7b4b9c 100644
+index a5b59eb79c014ef7a48ff305ed554fc33a184d87..e8c7cc10f10fc013100fa66f3489ac98b3a29227 100644
 --- a/net/minecraft/commands/Commands.java
 +++ b/net/minecraft/commands/Commands.java
-@@ -253,7 +253,11 @@ public class Commands {
+@@ -255,7 +255,11 @@ public class Commands {
          TimeCommand.register(this.dispatcher);
          TitleCommand.register(this.dispatcher, context);
          //TriggerCommand.register(this.dispatcher); // Folia - region threading - TODO later
 -        //WaypointCommand.register(this.dispatcher, context); // Folia - region threading - TODO later
 +        // Lophine start - unsafe waypoint bar
-+        if (fun.bm.lophine.config.modules.experiment.WaypointConfig.forceEnableWaypointUnsafe) {
++        if (fun.bm.lophine.config.modules.experiment.CommandConfig.waypoint) {
 +            WaypointCommand.register(this.dispatcher, context); // Folia - region threading - TODO later
 +        }
 +        // Lophine end - unsafe waypoint bar
@@ -22,7 +22,7 @@ index 94a3cea5d42b1f98bbde22ef514f8f7dbd64ba58..e311977fca4d0ba6e3efd4a41b2732cf
          WorldBorderCommand.register(this.dispatcher);
          if (JvmProfiler.INSTANCE.isAvailable()) {
 diff --git a/net/minecraft/server/waypoints/ServerWaypointManager.java b/net/minecraft/server/waypoints/ServerWaypointManager.java
-index 0f8cacbb8fe55a60e2f0c98bf36c005b29f41a4b..36e9b027ce5213f8914728293633e78e9905c1b2 100644
+index 0f8cacbb8fe55a60e2f0c98bf36c005b29f41a4b..52fd730998535ea071bfc99b7cc2c254b9b656d7 100644
 --- a/net/minecraft/server/waypoints/ServerWaypointManager.java
 +++ b/net/minecraft/server/waypoints/ServerWaypointManager.java
 @@ -22,7 +22,14 @@ public class ServerWaypointManager implements WaypointManager<WaypointTransmitte
@@ -31,7 +31,7 @@ index 0f8cacbb8fe55a60e2f0c98bf36c005b29f41a4b..36e9b027ce5213f8914728293633e78e
      public void trackWaypoint(WaypointTransmitter waypoint) {
 -        // Folia - region threading
 +        // Lophine start - unsafe waypoint bar
-+        if (!fun.bm.lophine.config.modules.experiment.WaypointConfig.forceEnableWaypointUnsafe) return;
++        if (!fun.bm.lophine.config.modules.experiment.CommandConfig.waypoint) return;
 +        this.waypoints.add(waypoint);
 +
 +        for (ServerPlayer serverPlayer : this.players) {
@@ -46,7 +46,7 @@ index 0f8cacbb8fe55a60e2f0c98bf36c005b29f41a4b..36e9b027ce5213f8914728293633e78e
      public void addPlayer(ServerPlayer player) {
          // Folia - region threading
 +        // Lophine start - unsafe waypoint bar
-+        if (!fun.bm.lophine.config.modules.experiment.WaypointConfig.forceEnableWaypointUnsafe) return;
++        if (!fun.bm.lophine.config.modules.experiment.CommandConfig.waypoint) return;
 +        this.players.add(player);
 +
 +        for (WaypointTransmitter waypointTransmitter : this.waypoints) {
@@ -62,7 +62,7 @@ index 0f8cacbb8fe55a60e2f0c98bf36c005b29f41a4b..36e9b027ce5213f8914728293633e78e
      public void updatePlayer(ServerPlayer player) {
          // Folia - region threading
 +        // Lophine start - unsafe waypoint bar
-+        if (!fun.bm.lophine.config.modules.experiment.WaypointConfig.forceEnableWaypointUnsafe) return;
++        if (!fun.bm.lophine.config.modules.experiment.CommandConfig.waypoint) return;
 +        Map<WaypointTransmitter, WaypointTransmitter.Connection> map = this.connections.row(player);
 +        SetView<WaypointTransmitter> set = Sets.difference(this.waypoints, map.keySet());
 +
@@ -79,7 +79,7 @@ index 0f8cacbb8fe55a60e2f0c98bf36c005b29f41a4b..36e9b027ce5213f8914728293633e78e
      public void removePlayer(ServerPlayer player) {
          // Folia - region threading
 +        // Lophine start - unsafe waypoint bar
-+        if (!fun.bm.lophine.config.modules.experiment.WaypointConfig.forceEnableWaypointUnsafe) return;
++        if (!fun.bm.lophine.config.modules.experiment.CommandConfig.waypoint) return;
 +        this.connections.row(player).values().removeIf(connection -> {
 +            connection.disconnect();
 +            return true;
diff --git a/lophine-server/minecraft-patches/features/0008-Leaves-Base-Protocol-Core.patch b/lophine-server/minecraft-patches/features/0009-Leaves-Base-Protocol-Core.patch
similarity index 100%
rename from lophine-server/minecraft-patches/features/0008-Leaves-Base-Protocol-Core.patch
rename to lophine-server/minecraft-patches/features/0009-Leaves-Base-Protocol-Core.patch
diff --git a/lophine-server/minecraft-patches/features/0009-Leaves-Item-overstack-util.patch b/lophine-server/minecraft-patches/features/0010-Leaves-Item-overstack-util.patch
similarity index 99%
rename from lophine-server/minecraft-patches/features/0009-Leaves-Item-overstack-util.patch
rename to lophine-server/minecraft-patches/features/0010-Leaves-Item-overstack-util.patch
index 35d0975..6582e5d 100644
--- a/lophine-server/minecraft-patches/features/0009-Leaves-Item-overstack-util.patch
+++ b/lophine-server/minecraft-patches/features/0010-Leaves-Item-overstack-util.patch
@@ -446,7 +446,7 @@ index 10b2cc20bbf3b70e4e09dbbe14b90506e6366158..1535bb8cec8692e8d26eaff090288f1b
      }
  
 diff --git a/net/minecraft/world/level/block/entity/HopperBlockEntity.java b/net/minecraft/world/level/block/entity/HopperBlockEntity.java
-index accbf3256db42b1ce15ea022fcfe1c61e8cb1c7a..8b7d885ae0ec48039dc1573a5227c322454e46ab 100644
+index 4b634dbb45dfb0823e7b21cf2354f89e5a6331e9..ef32bf1351aa28953bfc625d7a7d5175181a7acc 100644
 --- a/net/minecraft/world/level/block/entity/HopperBlockEntity.java
 +++ b/net/minecraft/world/level/block/entity/HopperBlockEntity.java
 @@ -145,7 +145,7 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
@@ -458,7 +458,7 @@ index accbf3256db42b1ce15ea022fcfe1c61e8cb1c7a..8b7d885ae0ec48039dc1573a5227c322
      }
  
      @Override
-@@ -759,9 +759,9 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
+@@ -770,9 +770,9 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
              if (item.isEmpty()) {
                  // Spigot start - SPIGOT-6693, SimpleContainer#setItem
                  ItemStack leftover = ItemStack.EMPTY; // Paper - Make hoppers respect inventory max stack size
diff --git a/lophine-server/minecraft-patches/features/0010-Leaves-Old-Explosion-Damage-Calculator.patch b/lophine-server/minecraft-patches/features/0011-Leaves-Old-Explosion-Damage-Calculator.patch
similarity index 100%
rename from lophine-server/minecraft-patches/features/0010-Leaves-Old-Explosion-Damage-Calculator.patch
rename to lophine-server/minecraft-patches/features/0011-Leaves-Old-Explosion-Damage-Calculator.patch
diff --git a/lophine-server/minecraft-patches/features/0011-Leaves-Old-raid-behavior.patch b/lophine-server/minecraft-patches/features/0012-Leaves-Old-raid-behavior.patch
similarity index 100%
rename from lophine-server/minecraft-patches/features/0011-Leaves-Old-raid-behavior.patch
rename to lophine-server/minecraft-patches/features/0012-Leaves-Old-raid-behavior.patch
diff --git a/lophine-server/minecraft-patches/features/0012-Leaves-Redstone-Shears-Wrench.patch b/lophine-server/minecraft-patches/features/0013-Leaves-Redstone-Shears-Wrench.patch
similarity index 100%
rename from lophine-server/minecraft-patches/features/0012-Leaves-Redstone-Shears-Wrench.patch
rename to lophine-server/minecraft-patches/features/0013-Leaves-Redstone-Shears-Wrench.patch
diff --git a/lophine-server/minecraft-patches/features/0013-Leaves-Servux-Protocol.patch b/lophine-server/minecraft-patches/features/0014-Leaves-Servux-Protocol.patch
similarity index 100%
rename from lophine-server/minecraft-patches/features/0013-Leaves-Servux-Protocol.patch
rename to lophine-server/minecraft-patches/features/0014-Leaves-Servux-Protocol.patch
diff --git a/lophine-server/minecraft-patches/features/0014-Purpur-Barrels-and-enderchests-6-rows.patch b/lophine-server/minecraft-patches/features/0015-Purpur-Barrels-and-enderchests-6-rows.patch
similarity index 100%
rename from lophine-server/minecraft-patches/features/0014-Purpur-Barrels-and-enderchests-6-rows.patch
rename to lophine-server/minecraft-patches/features/0015-Purpur-Barrels-and-enderchests-6-rows.patch
diff --git a/lophine-server/minecraft-patches/features/0015-Compatibility-fix-for-Raid-Revert-and-Cross-Region-D.patch b/lophine-server/minecraft-patches/features/0016-Compatibility-fix-for-Raid-Revert-and-Cross-Region-D.patch
similarity index 100%
rename from lophine-server/minecraft-patches/features/0015-Compatibility-fix-for-Raid-Revert-and-Cross-Region-D.patch
rename to lophine-server/minecraft-patches/features/0016-Compatibility-fix-for-Raid-Revert-and-Cross-Region-D.patch
diff --git a/lophine-server/minecraft-patches/features/0016-Disable-some-check-for-operators.patch b/lophine-server/minecraft-patches/features/0017-Disable-some-check-for-operators.patch
similarity index 100%
rename from lophine-server/minecraft-patches/features/0016-Disable-some-check-for-operators.patch
rename to lophine-server/minecraft-patches/features/0017-Disable-some-check-for-operators.patch
diff --git a/lophine-server/minecraft-patches/features/0017-I18n-support.patch b/lophine-server/minecraft-patches/features/0018-I18n-support.patch
similarity index 100%
rename from lophine-server/minecraft-patches/features/0017-I18n-support.patch
rename to lophine-server/minecraft-patches/features/0018-I18n-support.patch
diff --git a/lophine-server/minecraft-patches/features/0018-Old-zombie-reinforcement.patch b/lophine-server/minecraft-patches/features/0019-Old-zombie-reinforcement.patch
similarity index 100%
rename from lophine-server/minecraft-patches/features/0018-Old-zombie-reinforcement.patch
rename to lophine-server/minecraft-patches/features/0019-Old-zombie-reinforcement.patch
diff --git a/lophine-server/minecraft-patches/features/0019-Spawn-invulnerable-time.patch b/lophine-server/minecraft-patches/features/0020-Spawn-invulnerable-time.patch
similarity index 95%
rename from lophine-server/minecraft-patches/features/0019-Spawn-invulnerable-time.patch
rename to lophine-server/minecraft-patches/features/0020-Spawn-invulnerable-time.patch
index 18d48ba..0ee5c94 100644
--- a/lophine-server/minecraft-patches/features/0019-Spawn-invulnerable-time.patch
+++ b/lophine-server/minecraft-patches/features/0020-Spawn-invulnerable-time.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Spawn invulnerable time
 
 
 diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
-index 6b7c92fdf562dfa46eee8e8acbc82b02fc3226c5..c29e9c6cb2513fe4b01a619e16433893efb44e6f 100644
+index de1263404395c28209234a556347284fa557f81c..44f0e3a675c612e9ca2bc40cc3898bdbca0f6718 100644
 --- a/net/minecraft/server/level/ServerPlayer.java
 +++ b/net/minecraft/server/level/ServerPlayer.java
 @@ -232,6 +232,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
diff --git a/lophine-server/minecraft-patches/features/0020-Leaves-Leaves-Fakeplayer.patch b/lophine-server/minecraft-patches/features/0021-Leaves-Leaves-Fakeplayer.patch
similarity index 98%
rename from lophine-server/minecraft-patches/features/0020-Leaves-Leaves-Fakeplayer.patch
rename to lophine-server/minecraft-patches/features/0021-Leaves-Leaves-Fakeplayer.patch
index 04238ed..37059c4 100644
--- a/lophine-server/minecraft-patches/features/0020-Leaves-Leaves-Fakeplayer.patch
+++ b/lophine-server/minecraft-patches/features/0021-Leaves-Leaves-Fakeplayer.patch
@@ -319,7 +319,7 @@ index 576dde41a4b48aac9079cca902f4371a31470af3..952b92c55d7192791a19ecebe80894f6
                  ServerLevel.this.updateSleepingPlayerList();
              }
 diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
-index c29e9c6cb2513fe4b01a619e16433893efb44e6f..ff803b5f73f7d2cfe9351add12c3fde69a1642b1 100644
+index 44f0e3a675c612e9ca2bc40cc3898bdbca0f6718..4b2dba8b30b72fb3acc00957b3e19d6fc178c99e 100644
 --- a/net/minecraft/server/level/ServerPlayer.java
 +++ b/net/minecraft/server/level/ServerPlayer.java
 @@ -219,7 +219,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
@@ -516,33 +516,33 @@ index cb863a36fc67e993956ec3be655e6e4b9764c051..908ec29a6e285122d1a8a43dc547b74a
  
      public boolean canBypassPlayerLimit(GameProfile profile) {
 diff --git a/net/minecraft/server/waypoints/ServerWaypointManager.java b/net/minecraft/server/waypoints/ServerWaypointManager.java
-index 36e9b027ce5213f8914728293633e78e9905c1b2..a8c2a93cc12bd5aa6760bed91baa680f3801ee5e 100644
+index 52fd730998535ea071bfc99b7cc2c254b9b656d7..0abf6f0265fcb916f2c2c76fb1313bd13444f4ad 100644
 --- a/net/minecraft/server/waypoints/ServerWaypointManager.java
 +++ b/net/minecraft/server/waypoints/ServerWaypointManager.java
-@@ -22,6 +22,11 @@ public class ServerWaypointManager implements WaypointManager<WaypointTransmitte
- 
-     @Override
+@@ -24,6 +24,11 @@ public class ServerWaypointManager implements WaypointManager<WaypointTransmitte
      public void trackWaypoint(WaypointTransmitter waypoint) {
+         // Lophine start - unsafe waypoint bar
+         if (!fun.bm.lophine.config.modules.experiment.CommandConfig.waypoint) return;
 +        // Leaves start - fakeplayer
 +        if (waypoint instanceof org.leavesmc.leaves.bot.ServerBot bot && !bot.getConfigValue(org.leavesmc.leaves.bot.agent.Configs.ENABLE_LOCATOR_BAR)) {
 +            return;
 +        }
 +        // Leaves end - fakeplayer
-         // Lophine start - unsafe waypoint bar
-         if (!fun.bm.lophine.config.modules.experiment.WaypointConfig.forceEnableWaypointUnsafe) return;
          this.waypoints.add(waypoint);
-@@ -57,6 +62,11 @@ public class ServerWaypointManager implements WaypointManager<WaypointTransmitte
  
-     public void addPlayer(ServerPlayer player) {
+         for (ServerPlayer serverPlayer : this.players) {
+@@ -59,6 +64,11 @@ public class ServerWaypointManager implements WaypointManager<WaypointTransmitte
          // Folia - region threading
+         // Lophine start - unsafe waypoint bar
+         if (!fun.bm.lophine.config.modules.experiment.CommandConfig.waypoint) return;
 +        // Leaves start - fakeplayer
 +        if (player instanceof org.leavesmc.leaves.bot.ServerBot) {
 +            return;
 +        }
 +        // Leaves end - fakeplayer
-         // Lophine start - unsafe waypoint bar
-         if (!fun.bm.lophine.config.modules.experiment.WaypointConfig.forceEnableWaypointUnsafe) return;
          this.players.add(player);
+ 
+         for (WaypointTransmitter waypointTransmitter : this.waypoints) {
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
 index ee4a459700d75676eae3422d4a0e10be73c45871..16c323ead67a9a4ef48d25670b89297a15457849 100644
 --- a/net/minecraft/world/entity/Entity.java
diff --git a/lophine-server/src/main/java/fun/bm/lophine/config/modules/experiment/CommandConfig.java b/lophine-server/src/main/java/fun/bm/lophine/config/modules/experiment/CommandConfig.java
index 776810f..9c30887 100644
--- a/lophine-server/src/main/java/fun/bm/lophine/config/modules/experiment/CommandConfig.java
+++ b/lophine-server/src/main/java/fun/bm/lophine/config/modules/experiment/CommandConfig.java
@@ -3,6 +3,7 @@ package fun.bm.lophine.config.modules.experiment;
 import me.earthme.luminol.config.IConfigModule;
 import me.earthme.luminol.config.flags.ConfigClassInfo;
 import me.earthme.luminol.config.flags.ConfigInfo;
+import me.earthme.luminol.config.flags.TransformedConfig;
 import me.earthme.luminol.enums.EnumConfigCategory;
 
 @ConfigClassInfo(configAttribution = EnumConfigCategory.EXPERIMENT, mainName = "command")
@@ -17,4 +18,16 @@ public class CommandConfig implements IConfigModule {
                     Allow to use datapack command
                         --- datapack hot-update unsupported, please restart server""")
     public static boolean datapack = false;
+
+    @ConfigInfo(baseName = "function_command_enabled", comments =
+            """
+                    Allow to use function command""")
+    public static boolean function = false;
+
+    @TransformedConfig(name = "enable-waypoint", category = {"experiment", "waypoint bar"})
+    @TransformedConfig(name = "enable-waypoint", category = {"experiment", "waypoint_bar"})
+    @ConfigInfo(baseName = "waypoint_command_enabled", comments = """
+                    Allow to use waypoint command
+            """)
+    public static boolean waypoint = false;
 }
\ No newline at end of file
diff --git a/lophine-server/src/main/java/fun/bm/lophine/config/modules/experiment/WaypointConfig.java b/lophine-server/src/main/java/fun/bm/lophine/config/modules/experiment/WaypointConfig.java
deleted file mode 100644
index 6e2a96f..0000000
--- a/lophine-server/src/main/java/fun/bm/lophine/config/modules/experiment/WaypointConfig.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package fun.bm.lophine.config.modules.experiment;
-
-import me.earthme.luminol.config.IConfigModule;
-import me.earthme.luminol.config.flags.ConfigClassInfo;
-import me.earthme.luminol.config.flags.ConfigInfo;
-import me.earthme.luminol.config.flags.TransformedConfig;
-import me.earthme.luminol.enums.EnumConfigCategory;
-
-@ConfigClassInfo(configAttribution = EnumConfigCategory.EXPERIMENT, mainName = "waypoint_bar")
-public class WaypointConfig implements IConfigModule {
-    @TransformedConfig(name = "enable-waypoint", category = {"experiment", "waypoint bar"})
-    @ConfigInfo(baseName = "enabled", comments =
-            """
-                    Enable waypoint bar unsafe""")
-    public static boolean forceEnableWaypointUnsafe = false;
-}
diff --git a/lophine-server/src/main/java/org/leavesmc/leaves/bot/agent/configs/LocatorBarConfig.java b/lophine-server/src/main/java/org/leavesmc/leaves/bot/agent/configs/LocatorBarConfig.java
index 899cd54..44727a5 100644
--- a/lophine-server/src/main/java/org/leavesmc/leaves/bot/agent/configs/LocatorBarConfig.java
+++ b/lophine-server/src/main/java/org/leavesmc/leaves/bot/agent/configs/LocatorBarConfig.java
@@ -17,7 +17,7 @@
 
 package org.leavesmc.leaves.bot.agent.configs;
 
-import fun.bm.lophine.config.modules.experiment.WaypointConfig;
+import fun.bm.lophine.config.modules.experiment.CommandConfig;
 import fun.bm.lophine.config.modules.function.FakeplayerConfig;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.server.waypoints.ServerWaypointManager;
@@ -36,7 +36,7 @@ public class LocatorBarConfig extends AbstractBotConfig<Boolean> {
 
     public LocatorBarConfig() {
         super(NAME, CommandArgument.of(CommandArgumentType.BOOLEAN).setSuggestion(0, List.of("true", "false")));
-        this.value = FakeplayerConfig.enableLocatorBar && WaypointConfig.forceEnableWaypointUnsafe;
+        this.value = FakeplayerConfig.enableLocatorBar && CommandConfig.waypoint;
     }
 
     @Override