diff --git a/src/main/java/net/raphimc/viaaprilfools/protocols/protocol1_14to3D_Shareware/Protocol1_14to3D_Shareware.java b/src/main/java/net/raphimc/viaaprilfools/protocols/protocol1_14to3D_Shareware/Protocol1_14to3D_Shareware.java
index decafb7..43bca2f 100644
--- a/src/main/java/net/raphimc/viaaprilfools/protocols/protocol1_14to3D_Shareware/Protocol1_14to3D_Shareware.java
+++ b/src/main/java/net/raphimc/viaaprilfools/protocols/protocol1_14to3D_Shareware/Protocol1_14to3D_Shareware.java
@@ -34,10 +34,10 @@ import net.raphimc.viaaprilfools.protocols.protocol1_14to3D_Shareware.storage.Ch
 
 public class Protocol1_14to3D_Shareware extends BackwardsProtocol<ClientboundPackets3D_Shareware, ClientboundPackets1_14, ServerboundPackets3D_Shareware, ServerboundPackets1_14> {
 
-    public static final BackwardsMappings MAPPINGS = new BackwardsMappings("3D_Shareware", "1.14");
+    public static final BackwardsMappings MAPPINGS = new BackwardsMappings("3D_Shareware", "1.14", Protocol1_14To1_13_2.class);
     private static final int SERVERSIDE_VIEW_DISTANCE = 64;
 
-    private BlockItemPackets3D_Shareware blockItemPackets;
+    private final BlockItemPackets3D_Shareware blockItemPackets = new BlockItemPackets3D_Shareware(this);
 
     public Protocol1_14to3D_Shareware() {
         super(ClientboundPackets3D_Shareware.class, ClientboundPackets1_14.class, ServerboundPackets3D_Shareware.class, ServerboundPackets1_14.class);
@@ -45,10 +45,8 @@ public class Protocol1_14to3D_Shareware extends BackwardsProtocol<ClientboundPac
 
     @Override
     protected void registerPackets() {
-        executeAsyncAfterLoaded(Protocol1_14To1_13_2.class, MAPPINGS::load);
+        super.registerPackets();
 
-        this.blockItemPackets = new BlockItemPackets3D_Shareware(this);
-        this.blockItemPackets.register();
         new EntityPackets3D_Shareware(this).registerPackets();
         final SoundRewriter<ClientboundPackets3D_Shareware> soundRewriter = new SoundRewriter<>(this);
         soundRewriter.registerSound(ClientboundPackets3D_Shareware.SOUND);
diff --git a/src/main/java/net/raphimc/viaaprilfools/protocols/protocol1_16to20w14infinite/Protocol1_16to20w14infinite.java b/src/main/java/net/raphimc/viaaprilfools/protocols/protocol1_16to20w14infinite/Protocol1_16to20w14infinite.java
index e457d0d..06eb2aa 100644
--- a/src/main/java/net/raphimc/viaaprilfools/protocols/protocol1_16to20w14infinite/Protocol1_16to20w14infinite.java
+++ b/src/main/java/net/raphimc/viaaprilfools/protocols/protocol1_16to20w14infinite/Protocol1_16to20w14infinite.java
@@ -42,12 +42,12 @@ import java.util.UUID;
 
 public class Protocol1_16to20w14infinite extends BackwardsProtocol<ClientboundPackets20w14infinite, ClientboundPackets1_16, ServerboundPackets20w14infinite, ServerboundPackets1_16> {
 
-    public static final BackwardsMappings MAPPINGS = new BackwardsMappings("20w14infinite", "1.16");
+    public static final BackwardsMappings MAPPINGS = new BackwardsMappings("20w14infinite", "1.16", Protocol1_16To1_15_2.class);
     private static final UUID ZERO_UUID = new UUID(0, 0);
 
-    private BlockItemPackets20w14infinite blockItemPackets;
+    private final BlockItemPackets20w14infinite blockItemPackets = new BlockItemPackets20w14infinite(this);
+    private final MetadataRewriter1_16to20w14infinite metadataRewriter = new MetadataRewriter1_16to20w14infinite(this);
     private TagRewriter<ClientboundPackets20w14infinite> tagRewriter;
-    private MetadataRewriter1_16to20w14infinite metadataRewriter;
 
     public Protocol1_16to20w14infinite() {
         super(ClientboundPackets20w14infinite.class, ClientboundPackets1_16.class, ServerboundPackets20w14infinite.class, ServerboundPackets1_16.class);
@@ -55,19 +55,11 @@ public class Protocol1_16to20w14infinite extends BackwardsProtocol<ClientboundPa
 
     @Override
     protected void registerPackets() {
-        this.metadataRewriter = new MetadataRewriter1_16to20w14infinite(this);
-        metadataRewriter.register();
+        super.registerPackets();
+
         tagRewriter = new TagRewriter<>(this);
-
-        this.executeAsyncAfterLoaded(Protocol1_16To1_15_2.class, () -> {
-            MAPPINGS.load();
-            this.onMappingDataLoaded();
-        });
-
         tagRewriter.register(ClientboundPackets20w14infinite.TAGS, RegistryType.ENTITY);
         new StatisticsRewriter<>(this).register(ClientboundPackets20w14infinite.STATISTICS);
-        this.blockItemPackets = new BlockItemPackets20w14infinite(this);
-        this.blockItemPackets.register();
         EntityPackets20w14infinite.register(this);
         final SoundRewriter<ClientboundPackets20w14infinite> soundRewriter = new SoundRewriter<>(this);
         soundRewriter.registerSound(ClientboundPackets20w14infinite.SOUND);