diff --git a/Compatibility/pom.xml b/Compatibility/pom.xml
index a0c8a521..b1ac25c1 100644
--- a/Compatibility/pom.xml
+++ b/Compatibility/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>com.songoda</groupId>
         <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.5.3</version>
+        <version>2.5.4</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/Compatibility/src/com/songoda/core/compatibility/ClassMapping.java b/Compatibility/src/com/songoda/core/compatibility/ClassMapping.java
index c3de776a..8022b6ab 100644
--- a/Compatibility/src/com/songoda/core/compatibility/ClassMapping.java
+++ b/Compatibility/src/com/songoda/core/compatibility/ClassMapping.java
@@ -4,7 +4,7 @@ public enum ClassMapping {
 
     BIOME_BASE("world.level.biome", "BiomeBase"),
     BIOME_STORAGE("world.level.chunk", "BiomeStorage"),
-    BLOCK("level.block", "BlockPosition"),
+    BLOCK("world.level.block", "Block"),
     BLOCK_BASE("world.level.block.state", "BlockBase"),
     BLOCK_BUTTON_ABSTRACT("world.level.block", "BlockButtonAbstract"),
     BLOCK_PRESSURE_PLATE_ABSTRACT("world.level.block", "BlockPressurePlateAbstract"),
@@ -23,6 +23,7 @@ public enum ClassMapping {
     ITEM_STACK("world.item", "ItemStack"),
     LEVEL_ENTITY_GETTER("level.entity", "LevelEntityGetter"),
     MINECRAFT_SERVER("server", "MinecraftServer"),
+    NBT_COMPRESSED_STREAM_TOOLS("nbt", "NBTCompressedStreamTools"),
     NBT_TAG_COMPOUND("nbt", "NBTTagCompound"),
     NBT_TAG_LIST("nbt", "NBTTagList"),
     NBT_BASE("nbt", "NBTBase"),
diff --git a/Core/pom.xml b/Core/pom.xml
index 6acd2ee2..65f01789 100644
--- a/Core/pom.xml
+++ b/Core/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>com.songoda</groupId>
         <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.5.3</version>
+        <version>2.5.4</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/Core/src/main/java/com/songoda/core/SongodaCore.java b/Core/src/main/java/com/songoda/core/SongodaCore.java
index 1a9e9a17..5523b53c 100644
--- a/Core/src/main/java/com/songoda/core/SongodaCore.java
+++ b/Core/src/main/java/com/songoda/core/SongodaCore.java
@@ -56,7 +56,7 @@ public class SongodaCore {
     /**
      * This has been added as of Rev 6
      */
-    private final static String coreVersion = "2.5.3";
+    private final static String coreVersion = "2.5.4";
 
     /**
      * This is specific to the website api
diff --git a/NMS/NMS-API/pom.xml b/NMS/NMS-API/pom.xml
index fc818280..83655dfb 100644
--- a/NMS/NMS-API/pom.xml
+++ b/NMS/NMS-API/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>com.songoda</groupId>
         <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.5.3</version>
+        <version>2.5.4</version>
         <relativePath>../../</relativePath>
     </parent>
 
diff --git a/NMS/NMS-v1_10_R1/pom.xml b/NMS/NMS-v1_10_R1/pom.xml
index 03ce50ef..1b3ac3d3 100644
--- a/NMS/NMS-v1_10_R1/pom.xml
+++ b/NMS/NMS-v1_10_R1/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>com.songoda</groupId>
         <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.5.3</version>
+        <version>2.5.4</version>
         <relativePath>../../</relativePath>
     </parent>
 
diff --git a/NMS/NMS-v1_11_R1/pom.xml b/NMS/NMS-v1_11_R1/pom.xml
index 43213b26..31bedb09 100644
--- a/NMS/NMS-v1_11_R1/pom.xml
+++ b/NMS/NMS-v1_11_R1/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>com.songoda</groupId>
         <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.5.3</version>
+        <version>2.5.4</version>
         <relativePath>../../</relativePath>
     </parent>
 
diff --git a/NMS/NMS-v1_12_R1/pom.xml b/NMS/NMS-v1_12_R1/pom.xml
index 7db576c4..6bbbfdb7 100644
--- a/NMS/NMS-v1_12_R1/pom.xml
+++ b/NMS/NMS-v1_12_R1/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>com.songoda</groupId>
         <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.5.3</version>
+        <version>2.5.4</version>
         <relativePath>../../</relativePath>
     </parent>
 
diff --git a/NMS/NMS-v1_13_R1/pom.xml b/NMS/NMS-v1_13_R1/pom.xml
index 4aadb0c8..14ccb5ee 100644
--- a/NMS/NMS-v1_13_R1/pom.xml
+++ b/NMS/NMS-v1_13_R1/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>com.songoda</groupId>
         <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.5.3</version>
+        <version>2.5.4</version>
         <relativePath>../../</relativePath>
     </parent>
 
diff --git a/NMS/NMS-v1_13_R2/pom.xml b/NMS/NMS-v1_13_R2/pom.xml
index 31d69270..9fb30982 100644
--- a/NMS/NMS-v1_13_R2/pom.xml
+++ b/NMS/NMS-v1_13_R2/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>com.songoda</groupId>
         <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.5.3</version>
+        <version>2.5.4</version>
         <relativePath>../../</relativePath>
     </parent>
 
diff --git a/NMS/NMS-v1_14_R1/pom.xml b/NMS/NMS-v1_14_R1/pom.xml
index 99e7db27..690b4488 100644
--- a/NMS/NMS-v1_14_R1/pom.xml
+++ b/NMS/NMS-v1_14_R1/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>com.songoda</groupId>
         <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.5.3</version>
+        <version>2.5.4</version>
         <relativePath>../../</relativePath>
     </parent>
 
diff --git a/NMS/NMS-v1_15_R1/pom.xml b/NMS/NMS-v1_15_R1/pom.xml
index 6450283f..a0b7067a 100644
--- a/NMS/NMS-v1_15_R1/pom.xml
+++ b/NMS/NMS-v1_15_R1/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>com.songoda</groupId>
         <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.5.3</version>
+        <version>2.5.4</version>
         <relativePath>../../</relativePath>
     </parent>
 
diff --git a/NMS/NMS-v1_16_R1/pom.xml b/NMS/NMS-v1_16_R1/pom.xml
index dcf8ed09..eff6b877 100644
--- a/NMS/NMS-v1_16_R1/pom.xml
+++ b/NMS/NMS-v1_16_R1/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>com.songoda</groupId>
         <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.5.3</version>
+        <version>2.5.4</version>
         <relativePath>../../</relativePath>
     </parent>
 
diff --git a/NMS/NMS-v1_16_R2/pom.xml b/NMS/NMS-v1_16_R2/pom.xml
index 434cc2bb..76b18bd4 100644
--- a/NMS/NMS-v1_16_R2/pom.xml
+++ b/NMS/NMS-v1_16_R2/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>com.songoda</groupId>
         <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.5.3</version>
+        <version>2.5.4</version>
         <relativePath>../../</relativePath>
     </parent>
 
diff --git a/NMS/NMS-v1_16_R3/pom.xml b/NMS/NMS-v1_16_R3/pom.xml
index b7802744..aa92167c 100644
--- a/NMS/NMS-v1_16_R3/pom.xml
+++ b/NMS/NMS-v1_16_R3/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>com.songoda</groupId>
         <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.5.3</version>
+        <version>2.5.4</version>
         <relativePath>../../</relativePath>
     </parent>
 
diff --git a/NMS/NMS-v1_17_R1/pom.xml b/NMS/NMS-v1_17_R1/pom.xml
index 10145fbe..324c002a 100644
--- a/NMS/NMS-v1_17_R1/pom.xml
+++ b/NMS/NMS-v1_17_R1/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>com.songoda</groupId>
         <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.5.3</version>
+        <version>2.5.4</version>
         <relativePath>../../</relativePath>
     </parent>
 
diff --git a/NMS/NMS-v1_8_R1/pom.xml b/NMS/NMS-v1_8_R1/pom.xml
index 0dde1ca3..a892224a 100644
--- a/NMS/NMS-v1_8_R1/pom.xml
+++ b/NMS/NMS-v1_8_R1/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>com.songoda</groupId>
         <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.5.3</version>
+        <version>2.5.4</version>
         <relativePath>../../</relativePath>
     </parent>
 
diff --git a/NMS/NMS-v1_8_R2/pom.xml b/NMS/NMS-v1_8_R2/pom.xml
index e5882ddf..fd7227ea 100644
--- a/NMS/NMS-v1_8_R2/pom.xml
+++ b/NMS/NMS-v1_8_R2/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>com.songoda</groupId>
         <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.5.3</version>
+        <version>2.5.4</version>
         <relativePath>../../</relativePath>
     </parent>
 
diff --git a/NMS/NMS-v1_8_R3/pom.xml b/NMS/NMS-v1_8_R3/pom.xml
index cfef1197..4b35f42f 100644
--- a/NMS/NMS-v1_8_R3/pom.xml
+++ b/NMS/NMS-v1_8_R3/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>com.songoda</groupId>
         <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.5.3</version>
+        <version>2.5.4</version>
         <relativePath>../../</relativePath>
     </parent>
 
diff --git a/NMS/NMS-v1_9_R1/pom.xml b/NMS/NMS-v1_9_R1/pom.xml
index c20fdb3d..d6275f16 100644
--- a/NMS/NMS-v1_9_R1/pom.xml
+++ b/NMS/NMS-v1_9_R1/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>com.songoda</groupId>
         <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.5.3</version>
+        <version>2.5.4</version>
         <relativePath>../../</relativePath>
     </parent>
 
diff --git a/NMS/NMS-v1_9_R2/pom.xml b/NMS/NMS-v1_9_R2/pom.xml
index 8246c251..60c775ed 100644
--- a/NMS/NMS-v1_9_R2/pom.xml
+++ b/NMS/NMS-v1_9_R2/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>com.songoda</groupId>
         <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.5.3</version>
+        <version>2.5.4</version>
         <relativePath>../../</relativePath>
     </parent>
 
diff --git a/pom.xml b/pom.xml
index 687ef823..ef0a0a6f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
 
     <groupId>com.songoda</groupId>
     <artifactId>SongodaCore-Modules</artifactId>
-    <version>2.5.3</version>
+    <version>2.5.4</version>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>