diff --git a/build.gradle b/build.gradle
index 27f104e..cf4409b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -23,8 +23,8 @@ repositories {
 }
 
 dependencies {
-    compileOnly "com.viaversion:viaversion-common:4.10.0"
-    compileOnly "com.viaversion:viabackwards-common:4.10.0"
+    compileOnly "com.viaversion:viaversion-common:4.10.1-SNAPSHOT"
+    compileOnly "com.viaversion:viabackwards-common:4.10.1-SNAPSHOT"
     compileOnly "org.yaml:snakeyaml:2.2"
     compileOnly "com.google.guava:guava:33.2.0-jre"
     compileOnly "io.netty:netty-handler:4.1.109.Final"
diff --git a/src/main/java/net/raphimc/viaaprilfools/protocols/protocol1_16to20w14infinite/metadata/MetadataRewriter1_16to20w14infinite.java b/src/main/java/net/raphimc/viaaprilfools/protocols/protocol1_16to20w14infinite/metadata/MetadataRewriter1_16to20w14infinite.java
index 295c296..b153cf2 100644
--- a/src/main/java/net/raphimc/viaaprilfools/protocols/protocol1_16to20w14infinite/metadata/MetadataRewriter1_16to20w14infinite.java
+++ b/src/main/java/net/raphimc/viaaprilfools/protocols/protocol1_16to20w14infinite/metadata/MetadataRewriter1_16to20w14infinite.java
@@ -28,8 +28,6 @@ public class MetadataRewriter1_16to20w14infinite extends EntityRewriter<Clientbo
 
     public MetadataRewriter1_16to20w14infinite(Protocol1_16to20w14infinite protocol) {
         super(protocol);
-        mapEntityType(Entity20w14infiniteTypes.ZOMBIE_PIGMAN, EntityTypes1_16.ZOMBIFIED_PIGLIN);
-        mapTypes(Entity20w14infiniteTypes.values(), EntityTypes1_16.class);
     }
 
     @Override
@@ -45,6 +43,12 @@ protected void registerRewrites() {
         filter().type(EntityTypes1_16.ABSTRACT_ARROW).removeIndex(8);
     }
 
+    @Override
+    public void onMappingDataLoaded() {
+        mapTypes();
+        mapEntityType(Entity20w14infiniteTypes.ZOMBIE_PIGMAN, EntityTypes1_16.ZOMBIFIED_PIGLIN);
+    }
+
     @Override
     public EntityType typeFromId(int type) {
         return EntityTypes1_16.getTypeFromId(type);