diff --git a/plugins/fancydialogs/build.gradle.kts b/plugins/fancydialogs/build.gradle.kts
index 55095116..27b7f0b6 100644
--- a/plugins/fancydialogs/build.gradle.kts
+++ b/plugins/fancydialogs/build.gradle.kts
@@ -51,7 +51,8 @@ dependencies {
     implementation(project(":libraries:packets:packets-api"))
     implementation(project(":libraries:common"))
     implementation(project(":libraries:jdb"))
-    implementation("de.oliver.FancyAnalytics:api:0.1.6")
+    implementation("de.oliver.FancyAnalytics:java-sdk:0.0.3")
+    implementation("de.oliver.FancyAnalytics:mc-api:0.1.7")
     implementation("de.oliver.FancyAnalytics:logger:0.0.6")
 
     compileOnly(project(":plugins:fancynpcs:fn-api"))
diff --git a/plugins/fancydialogs/src/main/java/com/fancyinnovations/fancydialogs/analytics/Analytics.java b/plugins/fancydialogs/src/main/java/com/fancyinnovations/fancydialogs/analytics/Analytics.java
index 62477dfe..4aec9bbc 100644
--- a/plugins/fancydialogs/src/main/java/com/fancyinnovations/fancydialogs/analytics/Analytics.java
+++ b/plugins/fancydialogs/src/main/java/com/fancyinnovations/fancydialogs/analytics/Analytics.java
@@ -2,14 +2,15 @@ package com.fancyinnovations.fancydialogs.analytics;
 
 import com.fancyinnovations.fancydialogs.FancyDialogsPlugin;
 import de.oliver.fancyanalytics.api.FancyAnalyticsAPI;
-import de.oliver.fancyanalytics.api.events.Event;
 import de.oliver.fancyanalytics.api.metrics.MetricSupplier;
+import de.oliver.fancyanalytics.sdk.events.Event;
 import de.oliver.fancylib.VersionConfig;
 import org.bukkit.Bukkit;
 
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
+import java.util.HashMap;
 
 public class Analytics {
 
@@ -82,7 +83,7 @@ public class Analytics {
         if (!lastVersion.equals(currentVersion)) {
             FancyDialogsPlugin.get().getFancyLogger().info("Plugin has been updated from version " + lastVersion + " to " + currentVersion + ".");
             api.sendEvent(
-                    new Event("PluginVersionUpdated")
+                    new Event("PluginVersionUpdated", new HashMap<>())
                             .withProperty("from", lastVersion)
                             .withProperty("to", currentVersion)
                             .withProperty("commit_hash", versionConfig.getCommitHash())
diff --git a/plugins/fancyholograms-v2/build.gradle.kts b/plugins/fancyholograms-v2/build.gradle.kts
index d40c7076..544fe9d0 100644
--- a/plugins/fancyholograms-v2/build.gradle.kts
+++ b/plugins/fancyholograms-v2/build.gradle.kts
@@ -69,7 +69,8 @@ dependencies {
     implementation(project(":libraries:packets:packets-api"))
     implementation(project(":libraries:common"))
     implementation(project(":libraries:jdb"))
-    implementation("de.oliver.FancyAnalytics:api:0.1.6")
+    implementation("de.oliver.FancyAnalytics:java-sdk:0.0.3")
+    implementation("de.oliver.FancyAnalytics:mc-api:0.1.7")
     implementation("de.oliver.FancyAnalytics:logger:0.0.6")
 
     compileOnly(project(":plugins:fancynpcs:fn-api"))
diff --git a/plugins/fancyholograms-v2/src/main/java/de/oliver/fancyholograms/storage/converter/HologramConverter.java b/plugins/fancyholograms-v2/src/main/java/de/oliver/fancyholograms/storage/converter/HologramConverter.java
index 30e2c115..b7cddd4c 100644
--- a/plugins/fancyholograms-v2/src/main/java/de/oliver/fancyholograms/storage/converter/HologramConverter.java
+++ b/plugins/fancyholograms-v2/src/main/java/de/oliver/fancyholograms/storage/converter/HologramConverter.java
@@ -1,10 +1,11 @@
 package de.oliver.fancyholograms.storage.converter;
 
-import de.oliver.fancyanalytics.api.events.Event;
+import de.oliver.fancyanalytics.sdk.events.Event;
 import de.oliver.fancyholograms.FancyHolograms;
 import de.oliver.fancyholograms.api.data.HologramData;
 import org.jetbrains.annotations.NotNull;
 
+import java.util.HashMap;
 import java.util.List;
 
 public abstract class HologramConverter {
@@ -15,6 +16,7 @@ public abstract class HologramConverter {
 
     /**
      * Returns a list of converted holograms
+     *
      * @param spec Configuration of the hologram conversion
      * @return A list of converted holograms.
      */
@@ -23,13 +25,14 @@ public abstract class HologramConverter {
 
     /**
      * Returns a list of converted holograms
+     *
      * @param spec Configuration of the hologram conversion
      * @return A list of converted holograms.
      */
     public final @NotNull List<HologramData> convert(@NotNull HologramConversionSession spec) {
         List<HologramData> converted = convertHolograms(spec);
 
-        Event event = new Event("HologramsConverted")
+        Event event = new Event("HologramsConverted", new HashMap<>())
                 .withProperty("converter", getId())
                 .withProperty("target", spec.getTarget().getRegex().pattern())
                 .withProperty("amount", String.valueOf(converted.size()));
diff --git a/plugins/fancyholograms/build.gradle.kts b/plugins/fancyholograms/build.gradle.kts
index 093cdcf1..a31685eb 100644
--- a/plugins/fancyholograms/build.gradle.kts
+++ b/plugins/fancyholograms/build.gradle.kts
@@ -71,7 +71,8 @@ dependencies {
     implementation(project(":libraries:jdb"))
     implementation(project(":libraries:packets"))
     implementation(project(":libraries:packets:packets-api"))
-    implementation("de.oliver.FancyAnalytics:api:0.1.6")
+    implementation("de.oliver.FancyAnalytics:java-sdk:0.0.3")
+    implementation("de.oliver.FancyAnalytics:mc-api:0.1.7")
     implementation("de.oliver.FancyAnalytics:logger:0.0.6")
 
     compileOnly(project(":plugins:fancynpcs:fn-api"))
diff --git a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/converter/HologramConverter.java b/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/converter/HologramConverter.java
index 778b7253..4e68ae70 100644
--- a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/converter/HologramConverter.java
+++ b/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/converter/HologramConverter.java
@@ -1,10 +1,11 @@
 package de.oliver.fancyholograms.converter;
 
-import de.oliver.fancyanalytics.api.events.Event;
+import de.oliver.fancyanalytics.sdk.events.Event;
 import de.oliver.fancyholograms.api.data.HologramData;
 import de.oliver.fancyholograms.main.FancyHologramsPlugin;
 import org.jetbrains.annotations.NotNull;
 
+import java.util.HashMap;
 import java.util.List;
 
 public abstract class HologramConverter {
@@ -31,7 +32,7 @@ public abstract class HologramConverter {
     public final @NotNull List<HologramData> convert(@NotNull HologramConversionSession spec) {
         List<HologramData> converted = convertHolograms(spec);
 
-        Event event = new Event("HologramsConverted")
+        Event event = new Event("HologramsConverted", new HashMap<>())
                 .withProperty("converter", getId())
                 .withProperty("target", spec.getTarget().getRegex().pattern())
                 .withProperty("amount", String.valueOf(converted.size()));
diff --git a/plugins/fancynpcs/build.gradle.kts b/plugins/fancynpcs/build.gradle.kts
index e44c87a1..b437339e 100644
--- a/plugins/fancynpcs/build.gradle.kts
+++ b/plugins/fancynpcs/build.gradle.kts
@@ -72,7 +72,8 @@ dependencies {
     implementation(project(":libraries:jdb"))
     implementation(project(":libraries:plugin-tests"))
     compileOnly("org.lushplugins:ChatColorHandler:5.1.6")
-    implementation("de.oliver.FancyAnalytics:api:0.1.6")
+    implementation("de.oliver.FancyAnalytics:java-sdk:0.0.3")
+    implementation("de.oliver.FancyAnalytics:mc-api:0.1.7")
     implementation("de.oliver.FancyAnalytics:logger:0.0.6")
     implementation("org.incendo:cloud-core:2.1.0-SNAPSHOT")
     implementation("org.incendo:cloud-paper:2.0.0-SNAPSHOT")
diff --git a/plugins/fancynpcs/src/main/java/de/oliver/fancynpcs/FancyNpcs.java b/plugins/fancynpcs/src/main/java/de/oliver/fancynpcs/FancyNpcs.java
index 92797500..ec55dbb6 100644
--- a/plugins/fancynpcs/src/main/java/de/oliver/fancynpcs/FancyNpcs.java
+++ b/plugins/fancynpcs/src/main/java/de/oliver/fancynpcs/FancyNpcs.java
@@ -2,13 +2,13 @@ package de.oliver.fancynpcs;
 
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import de.oliver.fancyanalytics.api.FancyAnalyticsAPI;
-import de.oliver.fancyanalytics.api.events.Event;
 import de.oliver.fancyanalytics.api.metrics.MetricSupplier;
 import de.oliver.fancyanalytics.logger.ExtendedFancyLogger;
 import de.oliver.fancyanalytics.logger.LogLevel;
 import de.oliver.fancyanalytics.logger.appender.Appender;
 import de.oliver.fancyanalytics.logger.appender.ConsoleAppender;
 import de.oliver.fancyanalytics.logger.appender.JsonAppender;
+import de.oliver.fancyanalytics.sdk.events.Event;
 import de.oliver.fancylib.FancyLib;
 import de.oliver.fancylib.Metrics;
 import de.oliver.fancylib.VersionConfig;
@@ -65,10 +65,7 @@ import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
@@ -174,7 +171,7 @@ public class FancyNpcs extends JavaPlugin implements FancyNpcsPlugin {
         PluginManager pluginManager = Bukkit.getPluginManager();
 
         if (npcAdapter == null) {
-            fancyAnalytics.sendEvent(new Event("pluginLoadingWithUnsupportedVersion")
+            fancyAnalytics.sendEvent(new Event("pluginLoadingWithUnsupportedVersion", new HashMap<>())
                     .withProperty("version", mcVersion)
                     .withProperty("pluginVersion", getPluginMeta().getVersion())
             );
@@ -488,7 +485,7 @@ public class FancyNpcs extends JavaPlugin implements FancyNpcsPlugin {
         if (!lastVersion.equals(currentVersion)) {
             fancyLogger.info("Plugin has been updated from version " + lastVersion + " to " + currentVersion + ".");
             fancyAnalytics.sendEvent(
-                    new Event("PluginVersionUpdated")
+                    new Event("PluginVersionUpdated", new HashMap<>())
                             .withProperty("from", lastVersion)
                             .withProperty("to", currentVersion)
                             .withProperty("commit_hash", versionConfig.getCommitHash())
diff --git a/plugins/fancynpcs/src/main/java/de/oliver/fancynpcs/utils/OldSkinCacheMigrator.java b/plugins/fancynpcs/src/main/java/de/oliver/fancynpcs/utils/OldSkinCacheMigrator.java
index 35d9eef8..bdbda798 100644
--- a/plugins/fancynpcs/src/main/java/de/oliver/fancynpcs/utils/OldSkinCacheMigrator.java
+++ b/plugins/fancynpcs/src/main/java/de/oliver/fancynpcs/utils/OldSkinCacheMigrator.java
@@ -1,12 +1,13 @@
 package de.oliver.fancynpcs.utils;
 
-import de.oliver.fancyanalytics.api.events.Event;
+import de.oliver.fancyanalytics.sdk.events.Event;
 import de.oliver.fancynpcs.FancyNpcs;
 import de.oliver.fancynpcs.api.skins.SkinData;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.configuration.file.YamlConfiguration;
 
 import java.io.File;
+import java.util.HashMap;
 
 public class OldSkinCacheMigrator {
 
@@ -36,7 +37,7 @@ public class OldSkinCacheMigrator {
         OLD_SKIN_CACHE.delete();
 
         FancyNpcs.getInstance().getLogger().info("Migrated " + amount + " skins from old cache.");
-        FancyNpcs.getInstance().getFancyAnalytics().sendEvent(new Event("SkinCacheMigrated").withProperty("amount", String.valueOf(amount)));
+        FancyNpcs.getInstance().getFancyAnalytics().sendEvent(new Event("SkinCacheMigrated", new HashMap<>()).withProperty("amount", String.valueOf(amount)));
     }
 
 }
diff --git a/plugins/fancyvisuals/build.gradle.kts b/plugins/fancyvisuals/build.gradle.kts
index 3b7d87cd..d0457c4d 100644
--- a/plugins/fancyvisuals/build.gradle.kts
+++ b/plugins/fancyvisuals/build.gradle.kts
@@ -36,7 +36,7 @@ dependencies {
     implementation(project(":libraries:jdb"))
     implementation(project(":libraries:packets"))
     implementation(project(":libraries:packets:packets-api"))
-    compileOnly("de.oliver.FancyAnalytics:api:0.1.6") // loaded in FancyVisualLoader
+    compileOnly("de.oliver.FancyAnalytics:mc-api:0.1.7") // loaded in FancyVisualLoader
     compileOnly("de.oliver.FancyAnalytics:logger:0.0.6") // loaded in FancyVisualLoader
 
     implementation("org.lushplugins:ChatColorHandler:5.1.6")
diff --git a/plugins/fancyvisuals/src/main/java/de/oliver/fancyvisuals/loaders/FancyVisualsLoader.java b/plugins/fancyvisuals/src/main/java/de/oliver/fancyvisuals/loaders/FancyVisualsLoader.java
index 142cb450..49beffee 100644
--- a/plugins/fancyvisuals/src/main/java/de/oliver/fancyvisuals/loaders/FancyVisualsLoader.java
+++ b/plugins/fancyvisuals/src/main/java/de/oliver/fancyvisuals/loaders/FancyVisualsLoader.java
@@ -16,7 +16,7 @@ public class FancyVisualsLoader implements PluginLoader {
         MavenLibraryResolver resolver = new MavenLibraryResolver();
         resolver.addRepository(new RemoteRepository.Builder("fancyinnovations", "default", "https://repo.fancyinnovations.com/releases").build());
 //        resolver.addRepository(new RemoteRepository.Builder("mavencentral", "default", "https://repo1.maven.org/maven2/").build());
-        resolver.addDependency(new Dependency(new DefaultArtifact("de.oliver.FancyAnalytics:api:0.1.6"), "compile"));
+        resolver.addDependency(new Dependency(new DefaultArtifact("de.oliver.FancyAnalytics:mc-api:0.1.7"), "compile"));
         resolver.addDependency(new Dependency(new DefaultArtifact("de.oliver.FancyAnalytics:logger:0.0.6"), "compile"));
 
         classpathBuilder.addLibrary(resolver);