diff --git a/pom.xml b/pom.xml
index 465656e..8671173 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>de.fanta.challenges</groupId>
     <artifactId>ChallengesJoinEntities</artifactId>
-    <version>1.16.2-DEV</version>
+    <version>1.16.4-DEV</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.encoding>UTF-8</project.encoding>
@@ -23,7 +23,7 @@
         <dependency>
             <groupId>com.destroystokyo.paper</groupId>
             <artifactId>paper</artifactId>
-            <version>1.16.2-R0.1-SNAPSHOT</version>
+            <version>1.16.4-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/src/main/java/de/fanta/challengesjoinentities/ChallengesGlobalDataHelper.java b/src/main/java/de/fanta/challengesjoinentities/ChallengesGlobalDataHelper.java
index 94bce0b..aef27bb 100644
--- a/src/main/java/de/fanta/challengesjoinentities/ChallengesGlobalDataHelper.java
+++ b/src/main/java/de/fanta/challengesjoinentities/ChallengesGlobalDataHelper.java
@@ -1,5 +1,6 @@
 package de.fanta.challengesjoinentities;
 
+import de.cubeside.connection.GlobalServer;
 import de.cubeside.connection.event.GlobalServerConnectedEvent;
 import de.cubeside.connection.event.GlobalServerDisconnectedEvent;
 import de.fanta.challenges.Challenges;
@@ -27,7 +28,7 @@
     }
 
     @Override
-    protected void handleMessage(ChallengeMessageType challengeMessageType, DataInputStream data) throws IOException {
+        protected void handleMessage(ChallengeMessageType challengeMessageType, GlobalServer globalServer, DataInputStream data) throws IOException {
         String serverName = data.readUTF();
         switch (challengeMessageType) {
             case TIMER:
diff --git a/src/main/java/de/fanta/challengesjoinentities/ChallengesJoinEntities.java b/src/main/java/de/fanta/challengesjoinentities/ChallengesJoinEntities.java
index e873f8f..1787515 100644
--- a/src/main/java/de/fanta/challengesjoinentities/ChallengesJoinEntities.java
+++ b/src/main/java/de/fanta/challengesjoinentities/ChallengesJoinEntities.java
@@ -2,10 +2,10 @@
 
 import de.fanta.challengesjoinentities.JoinEntityData.ServerStatus;
 import de.fanta.challengesjoinentities.commands.AdventureCommand.AdventureLoadCommand;
+import de.fanta.challengesjoinentities.commands.ChallengesCommand.ChallengesloadCommand;
 import de.fanta.challengesjoinentities.commands.PiglinCommand.AddEntityCommand;
 import de.fanta.challengesjoinentities.commands.PiglinCommand.RemoveEntityCommand;
 import de.fanta.challengesjoinentities.commands.PiglinCommand.ToggleArenaCommand;
-import de.fanta.challengesjoinentities.commands.ChallengesCommand.ChallengesloadCommand;
 import de.fanta.challengesjoinentities.listeners.ChallengesEventListener;
 import de.fanta.challengesjoinentities.listeners.EntityListener;
 import de.fanta.challengesjoinentities.listeners.PlayerListener;
@@ -14,17 +14,14 @@
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.Material;
-import org.bukkit.craftbukkit.v1_16_R2.entity.CraftPiglin;
+import org.bukkit.craftbukkit.v1_16_R3.entity.CraftPiglin;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Piglin;
 import org.bukkit.event.entity.CreatureSpawnEvent;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.plugin.java.JavaPlugin;
-import org.bukkit.potion.PotionEffect;
-import org.bukkit.potion.PotionEffectType;
 import org.bukkit.util.Consumer;
-import org.bukkit.util.Vector;
 
 import java.util.HashMap;
 import java.util.HashSet;
diff --git a/src/main/java/de/fanta/challengesjoinentities/commands/PiglinCommand/RemoveEntityCommand.java b/src/main/java/de/fanta/challengesjoinentities/commands/PiglinCommand/RemoveEntityCommand.java
index ac69490..342aa40 100644
--- a/src/main/java/de/fanta/challengesjoinentities/commands/PiglinCommand/RemoveEntityCommand.java
+++ b/src/main/java/de/fanta/challengesjoinentities/commands/PiglinCommand/RemoveEntityCommand.java
@@ -6,7 +6,7 @@
 import de.iani.cubesideutils.commands.ArgsParser;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
-import org.bukkit.craftbukkit.v1_16_R2.entity.CraftPiglin;
+import org.bukkit.craftbukkit.v1_16_R3.entity.CraftPiglin;
 
 import java.util.Collection;
 import java.util.Collections;