diff --git a/src/net/jitse/npclib/nms/v1_10_r1/packets/PacketPlayOutNamedEntitySpawnWrapper.java b/src/net/jitse/npclib/nms/v1_10_r1/packets/PacketPlayOutNamedEntitySpawnWrapper.java
index 9670c77..0bcdbc3 100644
--- a/src/net/jitse/npclib/nms/v1_10_r1/packets/PacketPlayOutNamedEntitySpawnWrapper.java
+++ b/src/net/jitse/npclib/nms/v1_10_r1/packets/PacketPlayOutNamedEntitySpawnWrapper.java
@@ -5,7 +5,10 @@
 package net.jitse.npclib.nms.v1_10_r1.packets;
 
 import com.comphenix.tinyprotocol.Reflection;
-import net.minecraft.server.v1_10_R1.*;
+import net.minecraft.server.v1_10_R1.DataWatcher;
+import net.minecraft.server.v1_10_R1.DataWatcherObject;
+import net.minecraft.server.v1_10_R1.DataWatcherRegistry;
+import net.minecraft.server.v1_10_R1.PacketPlayOutNamedEntitySpawn;
 import org.bukkit.Location;
 
 import java.util.UUID;
@@ -33,10 +36,8 @@ public class PacketPlayOutNamedEntitySpawnWrapper {
         Reflection.getField(packetPlayOutNamedEntitySpawn.getClass(), "g", byte.class)
                 .set(packetPlayOutNamedEntitySpawn, (byte) ((int) (location.getPitch() * 256.0F / 360.0F)));
 
-        // Todo: This DataWatcher object doesn't register correctly.
         DataWatcher dataWatcher = new DataWatcher(null);
-        DataWatcherObject<Byte> object = DataWatcher.a(EntityHuman.class, DataWatcherRegistry.a);
-        dataWatcher.register(object, (byte) 127);
+        dataWatcher.register(new DataWatcherObject<>(13, DataWatcherRegistry.a), (byte) 127);
 
         Reflection.getField(packetPlayOutNamedEntitySpawn.getClass(), "h", DataWatcher.class)
                 .set(packetPlayOutNamedEntitySpawn, dataWatcher);
diff --git a/src/net/jitse/npclib/nms/v1_11_r1/packets/PacketPlayOutNamedEntitySpawnWrapper.java b/src/net/jitse/npclib/nms/v1_11_r1/packets/PacketPlayOutNamedEntitySpawnWrapper.java
index b085f64..1bf3cb9 100644
--- a/src/net/jitse/npclib/nms/v1_11_r1/packets/PacketPlayOutNamedEntitySpawnWrapper.java
+++ b/src/net/jitse/npclib/nms/v1_11_r1/packets/PacketPlayOutNamedEntitySpawnWrapper.java
@@ -5,7 +5,10 @@
 package net.jitse.npclib.nms.v1_11_r1.packets;
 
 import com.comphenix.tinyprotocol.Reflection;
-import net.minecraft.server.v1_11_R1.*;
+import net.minecraft.server.v1_11_R1.DataWatcher;
+import net.minecraft.server.v1_11_R1.DataWatcherObject;
+import net.minecraft.server.v1_11_R1.DataWatcherRegistry;
+import net.minecraft.server.v1_11_R1.PacketPlayOutNamedEntitySpawn;
 import org.bukkit.Location;
 
 import java.util.UUID;
@@ -33,10 +36,8 @@ public class PacketPlayOutNamedEntitySpawnWrapper {
         Reflection.getField(packetPlayOutNamedEntitySpawn.getClass(), "g", byte.class)
                 .set(packetPlayOutNamedEntitySpawn, (byte) ((int) (location.getPitch() * 256.0F / 360.0F)));
 
-        // Todo: This DataWatcher object doesn't register correctly.
         DataWatcher dataWatcher = new DataWatcher(null);
-        DataWatcherObject<Byte> object = DataWatcher.a(EntityHuman.class, DataWatcherRegistry.a);
-        dataWatcher.register(object, (byte) 127);
+        dataWatcher.register(new DataWatcherObject<>(13, DataWatcherRegistry.a), (byte) 127);
 
         Reflection.getField(packetPlayOutNamedEntitySpawn.getClass(), "h", DataWatcher.class)
                 .set(packetPlayOutNamedEntitySpawn, dataWatcher);
diff --git a/src/net/jitse/npclib/nms/v1_12_r1/packets/PacketPlayOutNamedEntitySpawnWrapper.java b/src/net/jitse/npclib/nms/v1_12_r1/packets/PacketPlayOutNamedEntitySpawnWrapper.java
index 611b404..679d923 100644
--- a/src/net/jitse/npclib/nms/v1_12_r1/packets/PacketPlayOutNamedEntitySpawnWrapper.java
+++ b/src/net/jitse/npclib/nms/v1_12_r1/packets/PacketPlayOutNamedEntitySpawnWrapper.java
@@ -5,7 +5,10 @@
 package net.jitse.npclib.nms.v1_12_r1.packets;
 
 import com.comphenix.tinyprotocol.Reflection;
-import net.minecraft.server.v1_12_R1.*;
+import net.minecraft.server.v1_12_R1.DataWatcher;
+import net.minecraft.server.v1_12_R1.DataWatcherObject;
+import net.minecraft.server.v1_12_R1.DataWatcherRegistry;
+import net.minecraft.server.v1_12_R1.PacketPlayOutNamedEntitySpawn;
 import org.bukkit.Location;
 
 import java.util.UUID;
@@ -33,10 +36,8 @@ public class PacketPlayOutNamedEntitySpawnWrapper {
         Reflection.getField(packetPlayOutNamedEntitySpawn.getClass(), "g", byte.class)
                 .set(packetPlayOutNamedEntitySpawn, (byte) ((int) (location.getPitch() * 256.0F / 360.0F)));
 
-        // Todo: This DataWatcher object doesn't register correctly.
         DataWatcher dataWatcher = new DataWatcher(null);
-        DataWatcherObject<Byte> object = DataWatcher.a(EntityHuman.class, DataWatcherRegistry.a);
-        dataWatcher.register(object, (byte) 127);
+        dataWatcher.register(new DataWatcherObject<>(13, DataWatcherRegistry.a), (byte) 127);
 
         Reflection.getField(packetPlayOutNamedEntitySpawn.getClass(), "h", DataWatcher.class)
                 .set(packetPlayOutNamedEntitySpawn, dataWatcher);
diff --git a/src/net/jitse/npclib/nms/v1_8_r1/packets/PacketPlayOutNamedEntitySpawnWrapper.java b/src/net/jitse/npclib/nms/v1_8_r1/packets/PacketPlayOutNamedEntitySpawnWrapper.java
index 3ba52ac..1968e4f 100644
--- a/src/net/jitse/npclib/nms/v1_8_r1/packets/PacketPlayOutNamedEntitySpawnWrapper.java
+++ b/src/net/jitse/npclib/nms/v1_8_r1/packets/PacketPlayOutNamedEntitySpawnWrapper.java
@@ -36,6 +36,7 @@ public class PacketPlayOutNamedEntitySpawnWrapper {
 
         DataWatcher dataWatcher = new DataWatcher(null);
         dataWatcher.a(10, (byte) 127);
+
         Reflection.getField(packetPlayOutNamedEntitySpawn.getClass(), "i", DataWatcher.class)
                 .set(packetPlayOutNamedEntitySpawn, dataWatcher);
 
diff --git a/src/net/jitse/npclib/nms/v1_8_r2/packets/PacketPlayOutNamedEntitySpawnWrapper.java b/src/net/jitse/npclib/nms/v1_8_r2/packets/PacketPlayOutNamedEntitySpawnWrapper.java
index 253d361..340e907 100644
--- a/src/net/jitse/npclib/nms/v1_8_r2/packets/PacketPlayOutNamedEntitySpawnWrapper.java
+++ b/src/net/jitse/npclib/nms/v1_8_r2/packets/PacketPlayOutNamedEntitySpawnWrapper.java
@@ -36,6 +36,7 @@ public class PacketPlayOutNamedEntitySpawnWrapper {
 
         DataWatcher dataWatcher = new DataWatcher(null);
         dataWatcher.a(10, (byte) 127);
+
         Reflection.getField(packetPlayOutNamedEntitySpawn.getClass(), "i", DataWatcher.class)
                 .set(packetPlayOutNamedEntitySpawn, dataWatcher);
 
diff --git a/src/net/jitse/npclib/nms/v1_8_r3/packets/PacketPlayOutNamedEntitySpawnWrapper.java b/src/net/jitse/npclib/nms/v1_8_r3/packets/PacketPlayOutNamedEntitySpawnWrapper.java
index 5d964b2..8f9aa53 100644
--- a/src/net/jitse/npclib/nms/v1_8_r3/packets/PacketPlayOutNamedEntitySpawnWrapper.java
+++ b/src/net/jitse/npclib/nms/v1_8_r3/packets/PacketPlayOutNamedEntitySpawnWrapper.java
@@ -36,6 +36,7 @@ public class PacketPlayOutNamedEntitySpawnWrapper {
 
         DataWatcher dataWatcher = new DataWatcher(null);
         dataWatcher.a(10, (byte) 127);
+
         Reflection.getField(packetPlayOutNamedEntitySpawn.getClass(), "i", DataWatcher.class)
                 .set(packetPlayOutNamedEntitySpawn, dataWatcher);
 
diff --git a/src/net/jitse/npclib/nms/v1_9_r1/packets/PacketPlayOutNamedEntitySpawnWrapper.java b/src/net/jitse/npclib/nms/v1_9_r1/packets/PacketPlayOutNamedEntitySpawnWrapper.java
index 0f5d373..c4709ae 100644
--- a/src/net/jitse/npclib/nms/v1_9_r1/packets/PacketPlayOutNamedEntitySpawnWrapper.java
+++ b/src/net/jitse/npclib/nms/v1_9_r1/packets/PacketPlayOutNamedEntitySpawnWrapper.java
@@ -5,7 +5,10 @@
 package net.jitse.npclib.nms.v1_9_r1.packets;
 
 import com.comphenix.tinyprotocol.Reflection;
-import net.minecraft.server.v1_9_R1.*;
+import net.minecraft.server.v1_9_R1.DataWatcher;
+import net.minecraft.server.v1_9_R1.DataWatcherObject;
+import net.minecraft.server.v1_9_R1.DataWatcherRegistry;
+import net.minecraft.server.v1_9_R1.PacketPlayOutNamedEntitySpawn;
 import org.bukkit.Location;
 
 import java.util.UUID;
@@ -33,10 +36,8 @@ public class PacketPlayOutNamedEntitySpawnWrapper {
         Reflection.getField(packetPlayOutNamedEntitySpawn.getClass(), "g", byte.class)
                 .set(packetPlayOutNamedEntitySpawn, (byte) ((int) (location.getPitch() * 256.0F / 360.0F)));
 
-        // Todo: This DataWatcher object doesn't register correctly.
         DataWatcher dataWatcher = new DataWatcher(null);
-        DataWatcherObject<Byte> object = DataWatcher.a(EntityHuman.class, DataWatcherRegistry.a);
-        dataWatcher.register(object, (byte) 127);
+        dataWatcher.register(new DataWatcherObject<>(12, DataWatcherRegistry.a), (byte) 127);
 
         Reflection.getField(packetPlayOutNamedEntitySpawn.getClass(), "h", DataWatcher.class)
                 .set(packetPlayOutNamedEntitySpawn, dataWatcher);
diff --git a/src/net/jitse/npclib/nms/v1_9_r2/packets/PacketPlayOutNamedEntitySpawnWrapper.java b/src/net/jitse/npclib/nms/v1_9_r2/packets/PacketPlayOutNamedEntitySpawnWrapper.java
index 871bdd5..7f63685 100644
--- a/src/net/jitse/npclib/nms/v1_9_r2/packets/PacketPlayOutNamedEntitySpawnWrapper.java
+++ b/src/net/jitse/npclib/nms/v1_9_r2/packets/PacketPlayOutNamedEntitySpawnWrapper.java
@@ -5,7 +5,10 @@
 package net.jitse.npclib.nms.v1_9_r2.packets;
 
 import com.comphenix.tinyprotocol.Reflection;
-import net.minecraft.server.v1_9_R2.*;
+import net.minecraft.server.v1_9_R2.DataWatcher;
+import net.minecraft.server.v1_9_R2.DataWatcherObject;
+import net.minecraft.server.v1_9_R2.DataWatcherRegistry;
+import net.minecraft.server.v1_9_R2.PacketPlayOutNamedEntitySpawn;
 import org.bukkit.Location;
 
 import java.util.UUID;
@@ -33,10 +36,8 @@ public class PacketPlayOutNamedEntitySpawnWrapper {
         Reflection.getField(packetPlayOutNamedEntitySpawn.getClass(), "g", byte.class)
                 .set(packetPlayOutNamedEntitySpawn, (byte) ((int) (location.getPitch() * 256.0F / 360.0F)));
 
-        // Todo: This DataWatcher object doesn't register correctly.
         DataWatcher dataWatcher = new DataWatcher(null);
-        DataWatcherObject<Byte> object = DataWatcher.a(EntityHuman.class, DataWatcherRegistry.a);
-        dataWatcher.register(object, (byte) 127);
+        dataWatcher.register(new DataWatcherObject<>(12, DataWatcherRegistry.a), (byte) 127);
 
         Reflection.getField(packetPlayOutNamedEntitySpawn.getClass(), "h", DataWatcher.class)
                 .set(packetPlayOutNamedEntitySpawn, dataWatcher);