diff --git a/Bungee/src/main/java/dev/brighten/antivpn/bungee/BungeeListener.java b/Bungee/src/main/java/dev/brighten/antivpn/bungee/BungeeListener.java
index 7d94b55..ae5c12e 100644
--- a/Bungee/src/main/java/dev/brighten/antivpn/bungee/BungeeListener.java
+++ b/Bungee/src/main/java/dev/brighten/antivpn/bungee/BungeeListener.java
@@ -1,10 +1,7 @@
 package dev.brighten.antivpn.bungee;
 
 import dev.brighten.antivpn.AntiVPN;
-import dev.brighten.antivpn.api.APIPlayer;
-import dev.brighten.antivpn.api.CheckResult;
-import dev.brighten.antivpn.api.OfflinePlayer;
-import dev.brighten.antivpn.api.VPNExecutor;
+import dev.brighten.antivpn.api.*;
 import dev.brighten.antivpn.utils.MiscUtils;
 import dev.brighten.antivpn.utils.StringUtil;
 import dev.brighten.antivpn.utils.Tuple;
@@ -79,7 +76,7 @@ public class BungeeListener extends VPNExecutor implements Listener {
         CheckResult instantResult = player.checkPlayer(result -> {
             if (!result.resultType().isShouldBlock()) return;
             AntiVPN.getInstance().getExecutor().getToKick()
-                    .add(new Tuple<>(result, event.getConnection().getUniqueId()));
+                    .add(new Tuple<>(result, player.getUuid()));
         });
 
         if (!instantResult.resultType().isShouldBlock()) {
diff --git a/Common/pom.xml b/Common/pom.xml
index 0854ccd..bed828a 100644
--- a/Common/pom.xml
+++ b/Common/pom.xml
@@ -57,6 +57,10 @@
                                         <exclude>dev.brighten.antivpn.depends.MavenLibraries</exclude>
                                     </excludes>
                                 </relocation>
+                                <relocation>
+                                    <pattern>com.github.benmanes.caffeine</pattern>
+                                    <shadedPattern>dev.brighten.antivpn.com.github.benmanes.caffeine</shadedPattern>
+                                </relocation>
                                 <relocation>
                                     <pattern>org.h2</pattern>
                                     <shadedPattern>dev.brighten.antivpn.shaded.org.h2</shadedPattern>
@@ -159,7 +163,7 @@
             <groupId>com.github.ben-manes.caffeine</groupId>
             <artifactId>caffeine</artifactId>
             <version>3.1.8</version>
-            <scope> compile</scope>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
diff --git a/Common/src/main/java/dev/brighten/antivpn/AntiVPN.java b/Common/src/main/java/dev/brighten/antivpn/AntiVPN.java
index 3eb00b2..6382ccb 100644
--- a/Common/src/main/java/dev/brighten/antivpn/AntiVPN.java
+++ b/Common/src/main/java/dev/brighten/antivpn/AntiVPN.java
@@ -47,6 +47,7 @@ import java.util.List;
                 @Relocate(from = "com.my\\" + "sql.jdbc", to = "dev.brighten.antivpn.shaded.com.mysql.jdbc")
         }
 )
+@MavenLibrary(groupId = "com.github.ben-manes.caffeine", artifactId = "caffeine", version = "3.1.8")
 public class AntiVPN {
 
     private static AntiVPN INSTANCE;
diff --git a/Common/src/main/java/dev/brighten/antivpn/utils/MiscUtils.java b/Common/src/main/java/dev/brighten/antivpn/utils/MiscUtils.java
index 50d7dea..77cde0b 100644
--- a/Common/src/main/java/dev/brighten/antivpn/utils/MiscUtils.java
+++ b/Common/src/main/java/dev/brighten/antivpn/utils/MiscUtils.java
@@ -73,8 +73,8 @@ public class MiscUtils {
             JSONObject object = JsonReader
                     .readJsonFromUrl("https://funkemunky.cc/mojang/uuid?name=" + playername);
 
-            if(object.has("id")) {
-                return formatFromMojangUUID(object.getString("uuid"));
+            if(object.has("uuid")) {
+                return UUID.fromString(object.getString("uuid"));
             }
         } catch (IOException | JSONException e) {
             AntiVPN.getInstance().getExecutor().logException("Error while looking up UUID for " + playername, e);
diff --git a/Sponge/pom.xml b/Sponge/pom.xml
index 98b6cc5..7af842c 100644
--- a/Sponge/pom.xml
+++ b/Sponge/pom.xml
@@ -13,8 +13,8 @@
 
     <repositories>
         <repository>
-            <id>sponge</id>
-            <url>https://repo.spongepowered.org/repository/maven-public/</url>
+            <id>spongepowered-repo</id>
+            <url>https://repo.spongepowered.org/maven/</url>
         </repository>
     </repositories>
 
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>org.spongepowered</groupId>
             <artifactId>spongeapi</artifactId>
-            <version>8.1.0</version>
+            <version>11.0.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -31,12 +31,6 @@
             <version>1.9.4-DEV</version>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <version>2.0.17</version>
-            <scope>compile</scope>
-        </dependency>
     </dependencies>
 
     <properties>
@@ -44,4 +38,41 @@
         <maven.compiler.target>17</maven.compiler.target>
     </properties>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.13.0</version>
+                <configuration>
+                    <source>17</source>
+                    <target>17</target>
+                    <compilerArgument>-XDignore.symbol.file</compilerArgument>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>3.6.0</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+    </build>
+
 </project>
\ No newline at end of file
diff --git a/Sponge/src/main/java/dev/brighten/antivpn/sponge/SpongeListener.java b/Sponge/src/main/java/dev/brighten/antivpn/sponge/SpongeListener.java
index 4519f61..c996343 100644
--- a/Sponge/src/main/java/dev/brighten/antivpn/sponge/SpongeListener.java
+++ b/Sponge/src/main/java/dev/brighten/antivpn/sponge/SpongeListener.java
@@ -19,10 +19,10 @@ public class SpongeListener extends VPNExecutor {
     @Listener(order = Order.EARLY)
     public void onJoin(ServerSideConnectionEvent.Auth event) {
         AtomicReference<APIPlayer> player = new AtomicReference<>(AntiVPN.getInstance().getPlayerExecutor()
-                .getPlayer(event.connection().profile().uuid())
+                .getPlayer(event.profile().uuid())
                 .orElse(new OfflinePlayer(
-                        event.connection().profile().uuid(),
-                        event.connection().profile().name().orElse("Unknown"),
+                        event.profile().uuid(),
+                        event.profile().name().orElse("Unknown"),
                         event.connection().address().getAddress()
                 )));
 
@@ -66,17 +66,17 @@ public class SpongeListener extends VPNExecutor {
 
     @Override
     public void registerListeners() {
-        Sponge.eventManager().registerListeners(SpongePlugin.INSTANCE.getPlugin(), this);
+        Sponge.eventManager().registerListeners(SpongePlugin.getInstance().getContainer(), this);
     }
 
     @Override
     public void log(Level level, String log, Object... objects) {
         if (level.equals(Level.SEVERE)) {
-            SpongePlugin.INSTANCE.getLogger().error(String.format(log, objects));
+            SpongePlugin.getInstance().getLogger().error(String.format(log, objects));
         } else if (level.equals(Level.WARNING)) {
-            SpongePlugin.INSTANCE.getLogger().warn(String.format(log, objects));
+            SpongePlugin.getInstance().getLogger().warn(String.format(log, objects));
         } else {
-            SpongePlugin.INSTANCE.getLogger().info(String.format(log, objects));
+            SpongePlugin.getInstance().getLogger().info(String.format(log, objects));
         }
     }
 
@@ -87,7 +87,7 @@ public class SpongeListener extends VPNExecutor {
 
     @Override
     public void logException(String message, Throwable ex) {
-        SpongePlugin.INSTANCE.getLogger().error(message, ex);
+        SpongePlugin.getInstance().getLogger().error(message, ex);
     }
 
     @Override
diff --git a/Sponge/src/main/java/dev/brighten/antivpn/sponge/SpongePlugin.java b/Sponge/src/main/java/dev/brighten/antivpn/sponge/SpongePlugin.java
index 3b68391..ae9cbb3 100644
--- a/Sponge/src/main/java/dev/brighten/antivpn/sponge/SpongePlugin.java
+++ b/Sponge/src/main/java/dev/brighten/antivpn/sponge/SpongePlugin.java
@@ -4,49 +4,52 @@ import com.google.inject.Inject;
 import dev.brighten.antivpn.AntiVPN;
 import lombok.Getter;
 import org.spongepowered.api.Server;
-import org.spongepowered.api.config.ConfigDir;
+import org.apache.logging.log4j.Logger;
+import org.spongepowered.api.Sponge;
+import org.spongepowered.api.config.ConfigManager;
 import org.spongepowered.api.event.Listener;
-import org.spongepowered.api.event.lifecycle.StartedEngineEvent;
-import org.spongepowered.api.event.lifecycle.StoppingEngineEvent;
+import org.spongepowered.api.event.lifecycle.*;
 import org.spongepowered.plugin.PluginContainer;
 import org.spongepowered.plugin.builtin.jvm.Plugin;
 
 import java.nio.file.Path;
-import org.slf4j.Logger;
 
 @Plugin("kaurivpn")
 @Getter
 public class SpongePlugin {
 
-    public static SpongePlugin INSTANCE;
-
     //Plugin init
-    @Inject
-    private PluginContainer plugin;
+    private final PluginContainer container;
+    private final Logger logger;
 
     @Inject
-    private Logger logger;
-
-    @Inject
-    @ConfigDir(sharedRoot = false)
-    private Path configDir;
+    SpongePlugin(final PluginContainer container, final Logger logger) {
+        this.container = container;
+        this.logger = logger;
+    }
 
 
     @Listener
-    public void onServerStart(final StartedEngineEvent<Server> event) {
-        INSTANCE = this;
-
-        logger.info("Starting AntiVPN services...");
+    public void onServerStart(final ConstructPluginEvent event) {
         //Start AntiVPN
 
+        ConfigManager configManager = Sponge.game().configManager();
         SpongeListener spongeListener = new SpongeListener();
 
-        AntiVPN.start(spongeListener, new SpongePlayerExecutor(), configDir.toFile());
+        var path = configManager.sharedConfig(container).directory();
+
+        logger.info("Fucking path: " + path);
+
+        AntiVPN.start(spongeListener, new SpongePlayerExecutor(), path.toFile());
     }
 
     @Listener
-    public void onServer(final StoppingEngineEvent<?> event) {
+    public void onServer(final StoppingEngineEvent<Server> event) {
         AntiVPN.getInstance().getExecutor().disablePlugin();
     }
 
+    public static SpongePlugin getInstance() {
+        return (SpongePlugin) Sponge.pluginManager().plugin("kaurivpn").get();
+    }
+
 }
diff --git a/Sponge/src/main/resources/META-INF/sponge_plugins.json b/Sponge/src/main/resources/META-INF/sponge_plugins.json
new file mode 100644
index 0000000..be21d3b
--- /dev/null
+++ b/Sponge/src/main/resources/META-INF/sponge_plugins.json
@@ -0,0 +1,29 @@
+{
+  "loader": {
+    "name": "java_plain",
+    "version": "1.0"
+  },
+  "license": "All-Rights-Reserved",
+  "plugins": [
+    {
+      "id": "kaurivpn",
+      "name": "Kauri VPN",
+      "version": "${version}",
+      "entrypoint": "dev.brighten.antivpn.sponge.SpongePlugin",
+      "description": "A simple and fast antivpn plugin.",
+      "branding": {},
+      "links": {
+      },
+      "contributors": [
+      ],
+      "dependencies": [
+        {
+          "id": "spongeapi",
+          "version": "11.0.0",
+          "load-order": "after",
+          "optional": false
+        }
+      ]
+    }
+  ]
+}
diff --git a/Universal/pom.xml b/Universal/pom.xml
index fe9424e..0706963 100644
--- a/Universal/pom.xml
+++ b/Universal/pom.xml
@@ -42,12 +42,11 @@
             <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>
-        <!-- Uncomment when complete -->
-        <!--<dependency>
+        <dependency>
             <groupId>dev.brighten.antivpn</groupId>
             <artifactId>Sponge</artifactId>
             <version>${project.version}</version>
-        </dependency>-->
+        </dependency>
     </dependencies>
 
     <build>
@@ -77,6 +76,10 @@
                                     <pattern>org.bstats</pattern>
                                     <shadedPattern>dev.brighten.antivpn.shaded.org.bstats</shadedPattern>
                                 </relocation>
+                                <relocation>
+                                    <pattern>org.objectweb</pattern>
+                                    <shadedPattern>dev.brighten.antivpn.shaded.org.objectweb</shadedPattern>
+                                </relocation>
                                 <!-- Add other relocations from Common/pom.xml -->
                             </relocations>
                         </configuration>