diff --git a/build.gradle b/build.gradle
index 97c45c5..4503b8a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -20,7 +20,7 @@ dependencies {
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.2'
     compileOnly 'dev.folia:folia-api:1.19.4-R0.1-SNAPSHOT'
     implementation 'com.froobworld:nab-configuration:1.0.2'
-    implementation 'org.bstats:bstats-bukkit:3.0.1'
+    implementation 'org.bstats:bstats-base:3.0.1'
 }
 
 processResources {
diff --git a/src/main/java/com/froobworld/seemore/metrics/Metrics.java b/src/main/java/com/froobworld/seemore/metrics/Metrics.java
new file mode 100644
index 0000000..db27b03
--- /dev/null
+++ b/src/main/java/com/froobworld/seemore/metrics/Metrics.java
@@ -0,0 +1,129 @@
+package com.froobworld.seemore.metrics;
+
+import org.bstats.MetricsBase;
+import org.bstats.charts.CustomChart;
+import org.bstats.json.JsonObjectBuilder;
+import org.bukkit.Bukkit;
+import org.bukkit.configuration.file.YamlConfiguration;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.Plugin;
+import org.bukkit.plugin.java.JavaPlugin;
+
+import java.io.File;
+import java.io.IOException;
+import java.lang.reflect.Method;
+import java.util.Collection;
+import java.util.UUID;
+import java.util.function.Consumer;
+import java.util.logging.Level;
+
+public class Metrics {
+    private final Plugin plugin;
+    private final MetricsBase metricsBase;
+
+    /**
+     * Creates a new Metrics instance.
+     *
+     * @param plugin Your plugin instance.
+     * @param serviceId The id of the service.
+     *                  It can be found at <a href="https://bstats.org/what-is-my-plugin-id">What is my plugin id?</a>
+     */
+    public Metrics(Plugin plugin, int serviceId, Consumer<Runnable> submitTaskConsumer) {
+        this.plugin = plugin;
+
+        // Get the config file
+        File bStatsFolder = new File(plugin.getDataFolder().getParentFile(), "bStats");
+        File configFile = new File(bStatsFolder, "config.yml");
+        YamlConfiguration config = YamlConfiguration.loadConfiguration(configFile);
+
+        if (!config.isSet("serverUuid")) {
+            config.addDefault("enabled", true);
+            config.addDefault("serverUuid", UUID.randomUUID().toString());
+            config.addDefault("logFailedRequests", false);
+            config.addDefault("logSentData", false);
+            config.addDefault("logResponseStatusText", false);
+
+            // Inform the server owners about bStats
+            config.options().header(
+                    "bStats (https://bStats.org) collects some basic information for plugin authors, like how\n" +
+                            "many people use their plugin and their total player count. It's recommended to keep bStats\n" +
+                            "enabled, but if you're not comfortable with this, you can turn this setting off. There is no\n" +
+                            "performance penalty associated with having metrics enabled, and data sent to bStats is fully\n" +
+                            "anonymous."
+            ).copyDefaults(true);
+            try {
+                config.save(configFile);
+            } catch (IOException ignored) { }
+        }
+
+        // Load the data
+        boolean enabled = config.getBoolean("enabled", true);
+        String serverUUID = config.getString("serverUuid");
+        boolean logErrors = config.getBoolean("logFailedRequests", false);
+        boolean logSentData = config.getBoolean("logSentData", false);
+        boolean logResponseStatusText = config.getBoolean("logResponseStatusText", false);
+
+        metricsBase = new MetricsBase(
+                "bukkit",
+                serverUUID,
+                serviceId,
+                enabled,
+                this::appendPlatformData,
+                this::appendServiceData,
+                submitTaskConsumer,
+                plugin::isEnabled,
+                (message, error) -> this.plugin.getLogger().log(Level.WARNING, message, error),
+                (message) -> this.plugin.getLogger().log(Level.INFO, message),
+                logErrors,
+                logSentData,
+                logResponseStatusText
+        );
+    }
+
+    /**
+     * Shuts down the underlying scheduler service.
+     */
+    public void shutdown() {
+        metricsBase.shutdown();
+    }
+
+    /**
+     * Adds a custom chart.
+     *
+     * @param chart The chart to add.
+     */
+    public void addCustomChart(CustomChart chart) {
+        metricsBase.addCustomChart(chart);
+    }
+
+    private void appendPlatformData(JsonObjectBuilder builder) {
+        builder.appendField("playerAmount", getPlayerAmount());
+        builder.appendField("onlineMode", Bukkit.getOnlineMode() ? 1 : 0);
+        builder.appendField("bukkitVersion", Bukkit.getVersion());
+        builder.appendField("bukkitName", Bukkit.getName());
+
+        builder.appendField("javaVersion", System.getProperty("java.version"));
+        builder.appendField("osName", System.getProperty("os.name"));
+        builder.appendField("osArch", System.getProperty("os.arch"));
+        builder.appendField("osVersion", System.getProperty("os.version"));
+        builder.appendField("coreCount", Runtime.getRuntime().availableProcessors());
+    }
+
+    private void appendServiceData(JsonObjectBuilder builder) {
+        builder.appendField("pluginVersion", plugin.getDescription().getVersion());
+    }
+
+    private int getPlayerAmount() {
+        try {
+            // Around MC 1.8 the return type was changed from an array to a collection,
+            // This fixes java.lang.NoSuchMethodError: org.bukkit.Bukkit.getOnlinePlayers()Ljava/util/Collection;
+            Method onlinePlayersMethod = Class.forName("org.bukkit.Server").getMethod("getOnlinePlayers");
+            return onlinePlayersMethod.getReturnType().equals(Collection.class)
+                    ? ((Collection<?>) onlinePlayersMethod.invoke(Bukkit.getServer())).size()
+                    : ((Player[]) onlinePlayersMethod.invoke(Bukkit.getServer())).length;
+        } catch (Exception e) {
+            return Bukkit.getOnlinePlayers().size(); // Just use the new method if the reflection failed
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/froobworld/seemore/metrics/SeeMoreMetrics.java b/src/main/java/com/froobworld/seemore/metrics/SeeMoreMetrics.java
index 75de2ed..6b09ae8 100644
--- a/src/main/java/com/froobworld/seemore/metrics/SeeMoreMetrics.java
+++ b/src/main/java/com/froobworld/seemore/metrics/SeeMoreMetrics.java
@@ -2,13 +2,12 @@
 
 import com.froobworld.seemore.SeeMore;
 import com.froobworld.seemore.metrics.charts.NumberOfWorldsChart;
-import org.bstats.bukkit.Metrics;
 
 public class SeeMoreMetrics {
     private final Metrics metrics;
 
     public SeeMoreMetrics(SeeMore seeMore) {
-        this.metrics = new Metrics(seeMore, 18658);
+        this.metrics = new Metrics(seeMore, 18658, seeMore.getSchedulerHook()::runTask);
         addCharts();
     }