diff --git a/.github/assets/serverwave_banner.png b/.github/assets/serverwave_banner.png
deleted file mode 100644
index bfbbcc9..0000000
Binary files a/.github/assets/serverwave_banner.png and /dev/null differ
diff --git a/.github/workflows/build-and-publish.yml b/.github/workflows/build-and-publish.yml
index 2427043..d2e9654 100644
--- a/.github/workflows/build-and-publish.yml
+++ b/.github/workflows/build-and-publish.yml
@@ -19,10 +19,10 @@ jobs:
       - name: Checkout Code
         uses: actions/checkout@v4
 
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'temurin'
           cache: maven
 
@@ -39,7 +39,7 @@ jobs:
           files: target/*.jar
           changelog-file: CHANGELOG.md
           game-versions: |
-            1.21
+            26
           loaders: |
             bukkit
             spigot
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index b03f93e..4e98f44 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -18,10 +18,10 @@ jobs:
     - name: Checkout Code
       uses: actions/checkout@v4
 
-    - name: Set up JDK 17
+    - name: Set up JDK 21
       uses: actions/setup-java@v4
       with:
-        java-version: '17'
+        java-version: '21'
         distribution: 'temurin'
         cache: maven
 
diff --git a/pom.xml b/pom.xml
index d9ef712..191f7f8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,14 +6,13 @@
 
     <groupId>fr.gamecreep</groupId>
     <artifactId>BasicHomes</artifactId>
-    <version>1.9.8-RELEASE-26.1.1</version>
+    <version>1.9.8-BETA-26.2</version>
     <packaging>jar</packaging>
 
     <name>BasicHomes</name>
 
     <description>Basic Minecraft Spigot plugin to use homes !</description>
     <properties>
-        <java.version>1.8</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
     <url>https://github.com/iGameCreep/BasicHomes</url>
@@ -25,8 +24,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.8.1</version>
                 <configuration>
-                    <source>16</source>
-                    <target>16</target>
+                    <source>21</source>
+                    <target>21</target>
                 </configuration>
             </plugin>
             <plugin>
@@ -46,15 +45,11 @@
                                     <pattern>org.bstats</pattern>
                                     <shadedPattern>fr.gamecreep.basichomes.libs.bstats</shadedPattern>
                                 </relocation>
+                                <relocation>
+                                    <pattern>dev.faststats</pattern>
+                                    <shadedPattern>fr.gamecreep.basichomes.libs.faststats</shadedPattern>
+                                </relocation>
                             </relocations>
-                            <filters>
-                                <filter>
-                                    <artifact>org.bstats:bstats-bukkit</artifact>
-                                    <includes>
-                                        <include>**</include>
-                                    </includes>
-                                </filter>
-                            </filters>
                         </configuration>
                     </execution>
                 </executions>
@@ -77,13 +72,18 @@
             <id>sonatype</id>
             <url>https://oss.sonatype.org/content/groups/public/</url>
         </repository>
+        <repository>
+            <id>faststats-releases</id>
+            <name>FastStats</name>
+            <url>https://repo.faststats.dev/releases</url>
+        </repository>
     </repositories>
 
     <dependencies>
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
-            <version>26.1.1-R0.1-SNAPSHOT</version>
+            <version>26.2-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -91,16 +91,21 @@
             <artifactId>bstats-bukkit</artifactId>
             <version>3.2.1</version>
         </dependency>
+        <dependency>
+            <groupId>dev.faststats.metrics</groupId>
+            <artifactId>bukkit</artifactId>
+            <version>0.30.1</version>
+        </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.44</version>
+            <version>1.18.48</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.13.2</version>
+            <version>2.14.0</version>
         </dependency>
         <dependency>
             <groupId>jakarta.annotation</groupId>
diff --git a/src/main/java/fr/gamecreep/basichomes/BasicHomes.java b/src/main/java/fr/gamecreep/basichomes/BasicHomes.java
index c26ba95..782b7c6 100644
--- a/src/main/java/fr/gamecreep/basichomes/BasicHomes.java
+++ b/src/main/java/fr/gamecreep/basichomes/BasicHomes.java
@@ -18,8 +18,6 @@
 import fr.gamecreep.basichomes.utils.TeleportUtils;
 import fr.gamecreep.basichomes.utils.Updater;
 import lombok.Getter;
-import org.bstats.bukkit.Metrics;
-import org.bstats.charts.SimplePie;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.entity.Player;
 import org.bukkit.permissions.PermissionAttachment;
@@ -110,13 +108,13 @@ private void loadConfig() {
 
     private void loadMetrics() {
         try {
-            final Metrics metrics = new Metrics(this, Constants.BSTATS_PLUGIN_ID);
-
-            metrics.addCustomChart(new SimplePie("using_warps",
-                    () -> Boolean.toString((Boolean) this.pluginConfig.getConfig().getOrDefault(ConfigElement.WARPS_ENABLED, false))
-            ));
+            MetricsLoader loader = new MetricsLoader(this);
 
+            loader.loadbStats();
             LoggerUtils.logInfo("Metrics (bStats) successfully loaded !");
+
+            loader.loadFastStats();
+            LoggerUtils.logInfo("Metrics (FastStats) successfully loaded !");
         } catch (Exception e) {
             LoggerUtils.logWarning("Failed to register plugin metrics: " + e.getMessage());
         }
diff --git a/src/main/java/fr/gamecreep/basichomes/Constants.java b/src/main/java/fr/gamecreep/basichomes/Constants.java
index 3338562..bf0ee0c 100644
--- a/src/main/java/fr/gamecreep/basichomes/Constants.java
+++ b/src/main/java/fr/gamecreep/basichomes/Constants.java
@@ -10,6 +10,7 @@ public class Constants {
 
     public static final String PLUGIN_VERSION = "1.9.8";
     public static final int BSTATS_PLUGIN_ID = 25429;
+    public static final String FASTSTATS_TOKEN = "c958237076bde0583471cdd8e83cae05";
 
     public static final ChatColor INFO_COLOR = ChatColor.DARK_AQUA;
     public static final ChatColor SUCCESS_COLOR = ChatColor.GREEN;
@@ -21,7 +22,7 @@ public class Constants {
         String colorTemp;
         try {
             colorTemp = net.md_5.bungee.api.ChatColor.of("#2596be").toString();
-        } catch (Throwable t) {
+        } catch (Exception e) {
             colorTemp = ChatColor.DARK_AQUA.toString();
         }
         PLUGIN_COLOR = colorTemp;
diff --git a/src/main/java/fr/gamecreep/basichomes/MetricsLoader.java b/src/main/java/fr/gamecreep/basichomes/MetricsLoader.java
new file mode 100644
index 0000000..e42f7fd
--- /dev/null
+++ b/src/main/java/fr/gamecreep/basichomes/MetricsLoader.java
@@ -0,0 +1,45 @@
+package fr.gamecreep.basichomes;
+
+import dev.faststats.ErrorTracker;
+import dev.faststats.bukkit.BukkitContext;
+import dev.faststats.data.Metric;
+import fr.gamecreep.basichomes.config.enums.ConfigElement;
+import org.bstats.charts.SimplePie;
+
+import java.util.Map;
+
+public class MetricsLoader {
+    public static final ErrorTracker ERROR_TRACKER = ErrorTracker.contextAware();
+
+    private final BasicHomes plugin;
+
+    public MetricsLoader(BasicHomes plugin) {
+        this.plugin = plugin;
+    }
+
+    public void loadbStats() {
+        org.bstats.bukkit.Metrics metrics = new org.bstats.bukkit.Metrics(this.plugin, Constants.BSTATS_PLUGIN_ID);
+
+        SimplePie warpsChart = new SimplePie("using_warps", () -> Boolean.toString(getWarpMetricValue()));
+        metrics.addCustomChart(warpsChart);
+    }
+
+    public void loadFastStats() {
+        BukkitContext context = new BukkitContext.Factory(this.plugin, Constants.FASTSTATS_TOKEN)
+                .errorTrackerService(ERROR_TRACKER)
+        .metrics(factory ->
+                factory
+                .addMetric(Metric.bool("using_warps", this::getWarpMetricValue))
+                .create()
+        )
+        .create();
+
+        context.ready();
+    }
+
+    private boolean getWarpMetricValue() {
+        Map<ConfigElement, Object> pluginConfig = plugin.getPluginConfig().getConfig();
+
+        return (Boolean) pluginConfig.getOrDefault(ConfigElement.WARPS_ENABLED, false);
+    }
+}
diff --git a/src/main/java/fr/gamecreep/basichomes/commands/permission/PermissionCommand.java b/src/main/java/fr/gamecreep/basichomes/commands/permission/PermissionCommand.java
index 18fc1c3..abcdc5a 100644
--- a/src/main/java/fr/gamecreep/basichomes/commands/permission/PermissionCommand.java
+++ b/src/main/java/fr/gamecreep/basichomes/commands/permission/PermissionCommand.java
@@ -41,13 +41,13 @@ public boolean onCommand(@NonNull final CommandSender sender,
                              @NonNull final String label,
                              @NonNull final String @NonNull[] args
     ) {
-        if (args.length < 3) return false;
-
         if (!sender.hasPermission(Permission.PERMISSIONS.getName())) {
             ChatUtils.sendNoPermission(sender, Permission.PERMISSIONS);
             return true;
         }
 
+        if (args.length < 3) return false;
+
         final String action = args[0].toLowerCase();
         final boolean isSet = action.equals(ActionType.SET.getStringValue());
         final boolean isRemove = action.equals(ActionType.REMOVE.getStringValue());