diff --git a/src/main/java/com/zhekasmirnov/innercore/api/NativeTileEntity.java b/src/main/java/com/zhekasmirnov/innercore/api/NativeTileEntity.java
index d54705bf..85920fde 100644
--- a/src/main/java/com/zhekasmirnov/innercore/api/NativeTileEntity.java
+++ b/src/main/java/com/zhekasmirnov/innercore/api/NativeTileEntity.java
@@ -95,30 +95,30 @@ public class NativeTileEntity {
     static {
         nukkitToEnumMappings = new HashMap<>(); // Keep in Nukkit order please
         nukkitToEnumMappings.put(BlockEntity.CHEST, "chest");
-        // nukkitToEnumMappings.put(BlockEntity.ENDER_CHEST, "ender_chest");
-        // nukkitToEnumMappings.put(BlockEntity.FURNACE, "furnace");
+        nukkitToEnumMappings.put(BlockEntity.ENDER_CHEST, "ender_chest");
+        nukkitToEnumMappings.put(BlockEntity.FURNACE, "furnace");
         nukkitToEnumMappings.put(BlockEntity.SIGN, "sign");
         nukkitToEnumMappings.put(BlockEntity.MOB_SPAWNER, "mob_spawner");
-        nukkitToEnumMappings.put(BlockEntity.ENCHANT_TABLE, "enchanting_table");
+        nukkitToEnumMappings.put(BlockEntity.ENCHANT_TABLE, "enchant_table");
         nukkitToEnumMappings.put(BlockEntity.SKULL, "skull");
         nukkitToEnumMappings.put(BlockEntity.FLOWER_POT, "flower_pot");
         nukkitToEnumMappings.put(BlockEntity.BREWING_STAND, "brewing_stand");
         nukkitToEnumMappings.put(BlockEntity.DAYLIGHT_DETECTOR, "daylight_detector");
-        nukkitToEnumMappings.put(BlockEntity.MUSIC, "music_block");
+        nukkitToEnumMappings.put(BlockEntity.MUSIC, "music");
         nukkitToEnumMappings.put(BlockEntity.ITEM_FRAME, "item_frame");
         nukkitToEnumMappings.put(BlockEntity.CAULDRON, "cauldron");
         nukkitToEnumMappings.put(BlockEntity.BEACON, "beacon");
-        nukkitToEnumMappings.put(BlockEntity.PISTON_ARM, "piston");
-        // nukkitToEnumMappings.put(BlockEntity.MOVING_BLOCK, "moving_block");
+        nukkitToEnumMappings.put(BlockEntity.PISTON_ARM, "piston_arm");
+        nukkitToEnumMappings.put(BlockEntity.MOVING_BLOCK, "moving_block");
         nukkitToEnumMappings.put(BlockEntity.COMPARATOR, "comparator");
         nukkitToEnumMappings.put(BlockEntity.HOPPER, "hopper");
         nukkitToEnumMappings.put(BlockEntity.BED, "bed");
         nukkitToEnumMappings.put(BlockEntity.JUKEBOX, "jukebox");
-        nukkitToEnumMappings.put(BlockEntity.SHULKER_BOX, "chest"); // TODO: shulker_box
-        // nukkitToEnumMappings.put(BlockEntity.BANNER, "banner");
+        nukkitToEnumMappings.put(BlockEntity.SHULKER_BOX, "shulker_box");
+        nukkitToEnumMappings.put(BlockEntity.BANNER, "banner");
         nukkitToEnumMappings.put(BlockEntity.LECTERN, "lectern");
-        // nukkitToEnumMappings.put(BlockEntity.DROPPER, "dropper");
-        // nukkitToEnumMappings.put(BlockEntity.DISPENSER, "dispenser");
+        nukkitToEnumMappings.put(BlockEntity.DROPPER, "dropper");
+        nukkitToEnumMappings.put(BlockEntity.DISPENSER, "dispenser");
         nukkitToEnumMappings.put(BlockEntity.BARREL, "barrel");
         nukkitToEnumMappings.put(BlockEntity.CAMPFIRE, "campfire");
         nukkitToEnumMappings.put(BlockEntity.BELL, "bell");
diff --git a/src/main/resources/innercore/assets/innercore/enum/enums-11.json b/src/main/resources/innercore/assets/innercore/enum/enums-11.json
index 0802c5f8..a6bf911c 100644
--- a/src/main/resources/innercore/assets/innercore/enum/enums-11.json
+++ b/src/main/resources/innercore/assets/innercore/enum/enums-11.json
@@ -531,34 +531,34 @@
     "skull": 6,
     "flower_pot": 7,
     "brewing_stand": 8,
-    "enchanting_table": 9,
+    "enchant_table": 9,
     "daylight_detector": 10,
-    "music_block": 11,
+    "music": 11,
     "comparator": 12,
     "dispenser": 13,
     "dropper": 14,
-    "hopper2": 15,
     "cauldron": 16,
     "item_frame": 17,
-    "piston": 18,
-    "chalkboard": 20,
+    "piston_arm": 18,
+    "moving_block": 19,
     "beacon": 21,
     "end_portal": 22,
+    "ender_chest": 23,
     "end_gateway": 24,
+    "shulker_box": 25,
     "command_block": 26,
     "bed": 27,
+    "banner": 28,
     "structure_block": 32,
     "jukebox": 33,
     "chemistry_table": 34,
-    "conduit_block": 35,
-    "jigsaw": 36,
+    "conduit": 35,
+    "jigsaw_block": 36,
     "lectern": 37,
     "blast_furnace": 38,
     "smoker": 39,
     "bell": 40,
     "campfire": 41,
-    "barrel": 42,
-    "beehive": 43,
-    "lodestone": 44
+    "barrel": 42
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/innercore/assets/innercore/enum/enums-16.json b/src/main/resources/innercore/assets/innercore/enum/enums-16.json
index 8bf01b09..76e577f8 100644
--- a/src/main/resources/innercore/assets/innercore/enum/enums-16.json
+++ b/src/main/resources/innercore/assets/innercore/enum/enums-16.json
@@ -534,27 +534,29 @@
     "skull": 6,
     "flower_pot": 7,
     "brewing_stand": 8,
-    "enchanting_table": 9,
+    "enchant_table": 9,
     "daylight_detector": 10,
-    "music_block": 11,
+    "music": 11,
     "comparator": 12,
     "dispenser": 13,
     "dropper": 14,
-    "hopper2": 15,
     "cauldron": 16,
     "item_frame": 17,
-    "piston": 18,
-    "chalkboard": 20,
+    "piston_arm": 18,
+    "moving_block": 19,
     "beacon": 21,
     "end_portal": 22,
+    "ender_chest": 23,
     "end_gateway": 24,
+    "shulker_box": 25,
     "command_block": 26,
     "bed": 27,
+    "banner": 28,
     "structure_block": 32,
     "jukebox": 33,
     "chemistry_table": 34,
-    "conduit_block": 35,
-    "jigsaw": 36,
+    "conduit": 35,
+    "jigsaw_block": 36,
     "lectern": 37,
     "blast_furnace": 38,
     "smoker": 39,