diff --git a/Core/pom.xml b/Core/pom.xml
index 08338879..17b8993f 100644
--- a/Core/pom.xml
+++ b/Core/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>com.songoda</groupId>
         <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.4.12</version>
+        <version>2.4.13</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 86e498b4..dc80d7d9 100644
--- a/Core/src/main/java/com/songoda/core/SongodaCore.java
+++ b/Core/src/main/java/com/songoda/core/SongodaCore.java
@@ -54,7 +54,7 @@ public class SongodaCore {
     /**
      * This has been added as of Rev 6
      */
-    private final static String coreVersion = "2.4.12";
+    private final static String coreVersion = "2.4.13";
     
     /**
      * This is specific to the website api
diff --git a/NMS/NMS-API/pom.xml b/NMS/NMS-API/pom.xml
index e5584ccd..b6cf8a22 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.4.12</version>
+        <version>2.4.13</version>
         <relativePath>../../</relativePath>
     </parent>
 
diff --git a/NMS/NMS-API/src/com/songoda/core/nms/nbt/NBTObject.java b/NMS/NMS-API/src/com/songoda/core/nms/nbt/NBTObject.java
index 41ee4109..ed71d932 100644
--- a/NMS/NMS-API/src/com/songoda/core/nms/nbt/NBTObject.java
+++ b/NMS/NMS-API/src/com/songoda/core/nms/nbt/NBTObject.java
@@ -1,5 +1,7 @@
 package com.songoda.core.nms.nbt;
 
+import java.util.Set;
+
 public interface NBTObject {
 
     String asString();
@@ -17,4 +19,8 @@ public interface NBTObject {
     byte asByte();
 
     int[] asIntArray();
+
+    Set<String> getKeys();
+
+    NBTCompound getCompound(String tag);
 }
diff --git a/NMS/NMS-v1_10_R1/pom.xml b/NMS/NMS-v1_10_R1/pom.xml
index b56a7570..3e0506ce 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.4.12</version>
+        <version>2.4.13</version>
         <relativePath>../../</relativePath>
     </parent>
 
diff --git a/NMS/NMS-v1_10_R1/src/com/songoda/core/nms/v1_10_R1/nbt/NBTCompoundImpl.java b/NMS/NMS-v1_10_R1/src/com/songoda/core/nms/v1_10_R1/nbt/NBTCompoundImpl.java
index 4cc8c6f7..13908a84 100644
--- a/NMS/NMS-v1_10_R1/src/com/songoda/core/nms/v1_10_R1/nbt/NBTCompoundImpl.java
+++ b/NMS/NMS-v1_10_R1/src/com/songoda/core/nms/v1_10_R1/nbt/NBTCompoundImpl.java
@@ -14,7 +14,7 @@ import java.io.OutputStream;
 import java.util.Set;
 import java.util.UUID;
 
-public abstract class NBTCompoundImpl implements NBTCompound {
+public class NBTCompoundImpl implements NBTCompound {
 
     protected NBTTagCompound compound;
 
@@ -143,7 +143,7 @@ public abstract class NBTCompoundImpl implements NBTCompound {
 
     @Override
     public Set<String> getKeys(String tag) {
-        return compound.getCompound(tag).c();
+        return getNBTObject(tag).getKeys();
     }
 
     @Override
@@ -175,4 +175,8 @@ public abstract class NBTCompoundImpl implements NBTCompound {
         }
     }
 
+    @Override
+    public void addExtras() {
+        // None
+    }
 }
diff --git a/NMS/NMS-v1_10_R1/src/com/songoda/core/nms/v1_10_R1/nbt/NBTObjectImpl.java b/NMS/NMS-v1_10_R1/src/com/songoda/core/nms/v1_10_R1/nbt/NBTObjectImpl.java
index c4adadfe..c794926c 100644
--- a/NMS/NMS-v1_10_R1/src/com/songoda/core/nms/v1_10_R1/nbt/NBTObjectImpl.java
+++ b/NMS/NMS-v1_10_R1/src/com/songoda/core/nms/v1_10_R1/nbt/NBTObjectImpl.java
@@ -1,8 +1,11 @@
 package com.songoda.core.nms.v1_10_R1.nbt;
 
+import com.songoda.core.nms.nbt.NBTCompound;
 import com.songoda.core.nms.nbt.NBTObject;
 import net.minecraft.server.v1_10_R1.NBTTagCompound;
 
+import java.util.Set;
+
 public class NBTObjectImpl implements NBTObject {
 
     private final NBTTagCompound compound;
@@ -53,4 +56,13 @@ public class NBTObjectImpl implements NBTObject {
         return compound.getIntArray(tag);
     }
 
+    @Override
+    public Set<String> getKeys() {
+        return compound.c();
+    }
+
+    @Override
+    public NBTCompound getCompound(String tag) {
+        return new NBTCompoundImpl(compound.getCompound(tag));
+    }
 }
diff --git a/NMS/NMS-v1_11_R1/pom.xml b/NMS/NMS-v1_11_R1/pom.xml
index b62cfa17..2aaf0418 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.4.12</version>
+        <version>2.4.13</version>
         <relativePath>../../</relativePath>
     </parent>
 
diff --git a/NMS/NMS-v1_11_R1/src/com/songoda/core/nms/v1_11_R1/nbt/NBTCompoundImpl.java b/NMS/NMS-v1_11_R1/src/com/songoda/core/nms/v1_11_R1/nbt/NBTCompoundImpl.java
index 471f307d..2cc17260 100644
--- a/NMS/NMS-v1_11_R1/src/com/songoda/core/nms/v1_11_R1/nbt/NBTCompoundImpl.java
+++ b/NMS/NMS-v1_11_R1/src/com/songoda/core/nms/v1_11_R1/nbt/NBTCompoundImpl.java
@@ -14,7 +14,7 @@ import java.io.OutputStream;
 import java.util.Set;
 import java.util.UUID;
 
-public abstract class NBTCompoundImpl implements NBTCompound {
+public class NBTCompoundImpl implements NBTCompound {
 
     protected NBTTagCompound compound;
 
@@ -143,7 +143,7 @@ public abstract class NBTCompoundImpl implements NBTCompound {
 
     @Override
     public Set<String> getKeys(String tag) {
-        return compound.getCompound(tag).c();
+        return getNBTObject(tag).getKeys();
     }
 
     @Override
@@ -175,4 +175,8 @@ public abstract class NBTCompoundImpl implements NBTCompound {
         }
     }
 
+    @Override
+    public void addExtras() {
+        // None
+    }
 }
diff --git a/NMS/NMS-v1_11_R1/src/com/songoda/core/nms/v1_11_R1/nbt/NBTObjectImpl.java b/NMS/NMS-v1_11_R1/src/com/songoda/core/nms/v1_11_R1/nbt/NBTObjectImpl.java
index 971fa7b9..2966692a 100644
--- a/NMS/NMS-v1_11_R1/src/com/songoda/core/nms/v1_11_R1/nbt/NBTObjectImpl.java
+++ b/NMS/NMS-v1_11_R1/src/com/songoda/core/nms/v1_11_R1/nbt/NBTObjectImpl.java
@@ -1,8 +1,11 @@
 package com.songoda.core.nms.v1_11_R1.nbt;
 
+import com.songoda.core.nms.nbt.NBTCompound;
 import com.songoda.core.nms.nbt.NBTObject;
 import net.minecraft.server.v1_11_R1.NBTTagCompound;
 
+import java.util.Set;
+
 public class NBTObjectImpl implements NBTObject {
 
     private final NBTTagCompound compound;
@@ -53,4 +56,13 @@ public class NBTObjectImpl implements NBTObject {
         return compound.getIntArray(tag);
     }
 
+    @Override
+    public Set<String> getKeys() {
+        return compound.c();
+    }
+
+    @Override
+    public NBTCompound getCompound(String tag) {
+        return new NBTCompoundImpl(compound.getCompound(tag));
+    }
 }
diff --git a/NMS/NMS-v1_12_R1/pom.xml b/NMS/NMS-v1_12_R1/pom.xml
index e0f461f0..d2025661 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.4.12</version>
+        <version>2.4.13</version>
         <relativePath>../../</relativePath>
     </parent>
 
diff --git a/NMS/NMS-v1_12_R1/src/com/songoda/core/nms/v1_12_R1/nbt/NBTCompoundImpl.java b/NMS/NMS-v1_12_R1/src/com/songoda/core/nms/v1_12_R1/nbt/NBTCompoundImpl.java
index ff8f2954..f015f13c 100644
--- a/NMS/NMS-v1_12_R1/src/com/songoda/core/nms/v1_12_R1/nbt/NBTCompoundImpl.java
+++ b/NMS/NMS-v1_12_R1/src/com/songoda/core/nms/v1_12_R1/nbt/NBTCompoundImpl.java
@@ -14,7 +14,7 @@ import java.io.OutputStream;
 import java.util.Set;
 import java.util.UUID;
 
-public abstract class NBTCompoundImpl implements NBTCompound {
+public class NBTCompoundImpl implements NBTCompound {
 
     protected NBTTagCompound compound;
 
@@ -143,7 +143,7 @@ public abstract class NBTCompoundImpl implements NBTCompound {
 
     @Override
     public Set<String> getKeys(String tag) {
-        return compound.getCompound(tag).c();
+        return getNBTObject(tag).getKeys();
     }
 
     @Override
@@ -175,4 +175,9 @@ public abstract class NBTCompoundImpl implements NBTCompound {
         }
     }
 
+    @Override
+    public void addExtras() {
+        // None
+    }
+
 }
diff --git a/NMS/NMS-v1_12_R1/src/com/songoda/core/nms/v1_12_R1/nbt/NBTObjectImpl.java b/NMS/NMS-v1_12_R1/src/com/songoda/core/nms/v1_12_R1/nbt/NBTObjectImpl.java
index 2b84696c..81b9989c 100644
--- a/NMS/NMS-v1_12_R1/src/com/songoda/core/nms/v1_12_R1/nbt/NBTObjectImpl.java
+++ b/NMS/NMS-v1_12_R1/src/com/songoda/core/nms/v1_12_R1/nbt/NBTObjectImpl.java
@@ -1,8 +1,11 @@
 package com.songoda.core.nms.v1_12_R1.nbt;
 
+import com.songoda.core.nms.nbt.NBTCompound;
 import com.songoda.core.nms.nbt.NBTObject;
 import net.minecraft.server.v1_12_R1.NBTTagCompound;
 
+import java.util.Set;
+
 public class NBTObjectImpl implements NBTObject {
 
     private final NBTTagCompound compound;
@@ -53,4 +56,13 @@ public class NBTObjectImpl implements NBTObject {
         return compound.getIntArray(tag);
     }
 
+    @Override
+    public Set<String> getKeys() {
+        return compound.c();
+    }
+
+    @Override
+    public NBTCompound getCompound(String tag) {
+        return new NBTCompoundImpl(compound.getCompound(tag));
+    }
 }
diff --git a/NMS/NMS-v1_13_R1/pom.xml b/NMS/NMS-v1_13_R1/pom.xml
index 80b949c0..847322a1 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.4.12</version>
+        <version>2.4.13</version>
         <relativePath>../../</relativePath>
     </parent>
 
diff --git a/NMS/NMS-v1_13_R1/src/com/songoda/core/nms/v1_13_R1/nbt/NBTCompoundImpl.java b/NMS/NMS-v1_13_R1/src/com/songoda/core/nms/v1_13_R1/nbt/NBTCompoundImpl.java
index 579c4274..ccccac20 100644
--- a/NMS/NMS-v1_13_R1/src/com/songoda/core/nms/v1_13_R1/nbt/NBTCompoundImpl.java
+++ b/NMS/NMS-v1_13_R1/src/com/songoda/core/nms/v1_13_R1/nbt/NBTCompoundImpl.java
@@ -14,7 +14,7 @@ import java.io.OutputStream;
 import java.util.Set;
 import java.util.UUID;
 
-public abstract class NBTCompoundImpl implements NBTCompound {
+public class NBTCompoundImpl implements NBTCompound {
 
     protected NBTTagCompound compound;
 
@@ -143,7 +143,7 @@ public abstract class NBTCompoundImpl implements NBTCompound {
 
     @Override
     public Set<String> getKeys(String tag) {
-        return compound.getCompound(tag).getKeys();
+        return getNBTObject(tag).getKeys();
     }
 
     @Override
@@ -175,4 +175,9 @@ public abstract class NBTCompoundImpl implements NBTCompound {
         }
     }
 
+    @Override
+    public void addExtras() {
+        // None
+    }
+
 }
diff --git a/NMS/NMS-v1_13_R1/src/com/songoda/core/nms/v1_13_R1/nbt/NBTObjectImpl.java b/NMS/NMS-v1_13_R1/src/com/songoda/core/nms/v1_13_R1/nbt/NBTObjectImpl.java
index e272447c..d50adb9c 100644
--- a/NMS/NMS-v1_13_R1/src/com/songoda/core/nms/v1_13_R1/nbt/NBTObjectImpl.java
+++ b/NMS/NMS-v1_13_R1/src/com/songoda/core/nms/v1_13_R1/nbt/NBTObjectImpl.java
@@ -1,8 +1,11 @@
 package com.songoda.core.nms.v1_13_R1.nbt;
 
+import com.songoda.core.nms.nbt.NBTCompound;
 import com.songoda.core.nms.nbt.NBTObject;
 import net.minecraft.server.v1_13_R1.NBTTagCompound;
 
+import java.util.Set;
+
 public class NBTObjectImpl implements NBTObject {
 
     private final NBTTagCompound compound;
@@ -53,4 +56,13 @@ public class NBTObjectImpl implements NBTObject {
         return compound.getIntArray(tag);
     }
 
+    @Override
+    public Set<String> getKeys() {
+        return compound.getKeys();
+    }
+
+    @Override
+    public NBTCompound getCompound(String tag) {
+        return new NBTCompoundImpl(compound.getCompound(tag));
+    }
 }
diff --git a/NMS/NMS-v1_13_R2/pom.xml b/NMS/NMS-v1_13_R2/pom.xml
index 7f44f8b4..76e5d6fb 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.4.12</version>
+        <version>2.4.13</version>
         <relativePath>../../</relativePath>
     </parent>
 
diff --git a/NMS/NMS-v1_13_R2/src/com/songoda/core/nms/v1_13_R2/nbt/NBTCompoundImpl.java b/NMS/NMS-v1_13_R2/src/com/songoda/core/nms/v1_13_R2/nbt/NBTCompoundImpl.java
index 990fa9a1..9227fdb7 100644
--- a/NMS/NMS-v1_13_R2/src/com/songoda/core/nms/v1_13_R2/nbt/NBTCompoundImpl.java
+++ b/NMS/NMS-v1_13_R2/src/com/songoda/core/nms/v1_13_R2/nbt/NBTCompoundImpl.java
@@ -14,7 +14,7 @@ import java.io.OutputStream;
 import java.util.Set;
 import java.util.UUID;
 
-public abstract class NBTCompoundImpl implements NBTCompound {
+public class NBTCompoundImpl implements NBTCompound {
 
     protected NBTTagCompound compound;
 
@@ -143,7 +143,7 @@ public abstract class NBTCompoundImpl implements NBTCompound {
 
     @Override
     public Set<String> getKeys(String tag) {
-        return compound.getCompound(tag).getKeys();
+        return getNBTObject(tag).getKeys();
     }
 
     @Override
@@ -175,4 +175,8 @@ public abstract class NBTCompoundImpl implements NBTCompound {
         }
     }
 
+    @Override
+    public void addExtras() {
+        // None
+    }
 }
diff --git a/NMS/NMS-v1_13_R2/src/com/songoda/core/nms/v1_13_R2/nbt/NBTObjectImpl.java b/NMS/NMS-v1_13_R2/src/com/songoda/core/nms/v1_13_R2/nbt/NBTObjectImpl.java
index 79951abc..d95f85b9 100644
--- a/NMS/NMS-v1_13_R2/src/com/songoda/core/nms/v1_13_R2/nbt/NBTObjectImpl.java
+++ b/NMS/NMS-v1_13_R2/src/com/songoda/core/nms/v1_13_R2/nbt/NBTObjectImpl.java
@@ -1,8 +1,11 @@
 package com.songoda.core.nms.v1_13_R2.nbt;
 
+import com.songoda.core.nms.nbt.NBTCompound;
 import com.songoda.core.nms.nbt.NBTObject;
 import net.minecraft.server.v1_13_R2.NBTTagCompound;
 
+import java.util.Set;
+
 public class NBTObjectImpl implements NBTObject {
 
     private final NBTTagCompound compound;
@@ -53,4 +56,13 @@ public class NBTObjectImpl implements NBTObject {
         return compound.getIntArray(tag);
     }
 
+    @Override
+    public Set<String> getKeys() {
+        return compound.getKeys();
+    }
+
+    @Override
+    public NBTCompound getCompound(String tag) {
+        return new NBTCompoundImpl(compound.getCompound(tag));
+    }
 }
diff --git a/NMS/NMS-v1_14_R1/pom.xml b/NMS/NMS-v1_14_R1/pom.xml
index 9553c338..b163668e 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.4.12</version>
+        <version>2.4.13</version>
         <relativePath>../../</relativePath>
     </parent>
 
diff --git a/NMS/NMS-v1_14_R1/src/com/songoda/core/nms/v1_14_R1/nbt/NBTCompoundImpl.java b/NMS/NMS-v1_14_R1/src/com/songoda/core/nms/v1_14_R1/nbt/NBTCompoundImpl.java
index 56e47497..e9b6402e 100644
--- a/NMS/NMS-v1_14_R1/src/com/songoda/core/nms/v1_14_R1/nbt/NBTCompoundImpl.java
+++ b/NMS/NMS-v1_14_R1/src/com/songoda/core/nms/v1_14_R1/nbt/NBTCompoundImpl.java
@@ -14,7 +14,7 @@ import java.io.OutputStream;
 import java.util.Set;
 import java.util.UUID;
 
-public abstract class NBTCompoundImpl implements NBTCompound {
+public class NBTCompoundImpl implements NBTCompound {
 
     protected NBTTagCompound compound;
 
@@ -143,7 +143,7 @@ public abstract class NBTCompoundImpl implements NBTCompound {
 
     @Override
     public Set<String> getKeys(String tag) {
-        return compound.getCompound(tag).getKeys();
+        return getNBTObject(tag).getKeys();
     }
 
     @Override
@@ -175,4 +175,8 @@ public abstract class NBTCompoundImpl implements NBTCompound {
         }
     }
 
+    @Override
+    public void addExtras() {
+        // None
+    }
 }
diff --git a/NMS/NMS-v1_14_R1/src/com/songoda/core/nms/v1_14_R1/nbt/NBTObjectImpl.java b/NMS/NMS-v1_14_R1/src/com/songoda/core/nms/v1_14_R1/nbt/NBTObjectImpl.java
index 56853f84..e3530d1c 100644
--- a/NMS/NMS-v1_14_R1/src/com/songoda/core/nms/v1_14_R1/nbt/NBTObjectImpl.java
+++ b/NMS/NMS-v1_14_R1/src/com/songoda/core/nms/v1_14_R1/nbt/NBTObjectImpl.java
@@ -1,8 +1,11 @@
 package com.songoda.core.nms.v1_14_R1.nbt;
 
+import com.songoda.core.nms.nbt.NBTCompound;
 import com.songoda.core.nms.nbt.NBTObject;
 import net.minecraft.server.v1_14_R1.NBTTagCompound;
 
+import java.util.Set;
+
 public class NBTObjectImpl implements NBTObject {
 
     private final NBTTagCompound compound;
@@ -53,5 +56,14 @@ public class NBTObjectImpl implements NBTObject {
         return compound.getIntArray(tag);
     }
 
+    @Override
+    public Set<String> getKeys() {
+        return compound.getKeys();
+    }
+
+    @Override
+    public NBTCompound getCompound(String tag) {
+        return new NBTCompoundImpl(compound.getCompound(tag));
+    }
 }
 
diff --git a/NMS/NMS-v1_15_R1/pom.xml b/NMS/NMS-v1_15_R1/pom.xml
index 4af491fc..778fdf0e 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.4.12</version>
+        <version>2.4.13</version>
         <relativePath>../../</relativePath>
     </parent>
 
diff --git a/NMS/NMS-v1_15_R1/src/com/songoda/core/nms/v1_15_R1/nbt/NBTCompoundImpl.java b/NMS/NMS-v1_15_R1/src/com/songoda/core/nms/v1_15_R1/nbt/NBTCompoundImpl.java
index 64b6a920..99181fc2 100644
--- a/NMS/NMS-v1_15_R1/src/com/songoda/core/nms/v1_15_R1/nbt/NBTCompoundImpl.java
+++ b/NMS/NMS-v1_15_R1/src/com/songoda/core/nms/v1_15_R1/nbt/NBTCompoundImpl.java
@@ -14,7 +14,7 @@ import java.io.OutputStream;
 import java.util.Set;
 import java.util.UUID;
 
-public abstract class NBTCompoundImpl implements NBTCompound {
+public class NBTCompoundImpl implements NBTCompound {
 
     protected NBTTagCompound compound;
 
@@ -143,7 +143,7 @@ public abstract class NBTCompoundImpl implements NBTCompound {
 
     @Override
     public Set<String> getKeys(String tag) {
-        return compound.getCompound(tag).getKeys();
+        return getNBTObject(tag).getKeys();
     }
 
     @Override
@@ -175,4 +175,8 @@ public abstract class NBTCompoundImpl implements NBTCompound {
         }
     }
 
+    @Override
+    public void addExtras() {
+        // None
+    }
 }
diff --git a/NMS/NMS-v1_15_R1/src/com/songoda/core/nms/v1_15_R1/nbt/NBTObjectImpl.java b/NMS/NMS-v1_15_R1/src/com/songoda/core/nms/v1_15_R1/nbt/NBTObjectImpl.java
index a9a3cc46..e647b7b6 100644
--- a/NMS/NMS-v1_15_R1/src/com/songoda/core/nms/v1_15_R1/nbt/NBTObjectImpl.java
+++ b/NMS/NMS-v1_15_R1/src/com/songoda/core/nms/v1_15_R1/nbt/NBTObjectImpl.java
@@ -1,8 +1,11 @@
 package com.songoda.core.nms.v1_15_R1.nbt;
 
+import com.songoda.core.nms.nbt.NBTCompound;
 import com.songoda.core.nms.nbt.NBTObject;
 import net.minecraft.server.v1_15_R1.NBTTagCompound;
 
+import java.util.Set;
+
 public class NBTObjectImpl implements NBTObject {
 
     private final NBTTagCompound compound;
@@ -53,4 +56,13 @@ public class NBTObjectImpl implements NBTObject {
         return compound.getIntArray(tag);
     }
 
+    @Override
+    public Set<String> getKeys() {
+        return compound.getKeys();
+    }
+
+    @Override
+    public NBTCompound getCompound(String tag) {
+        return new NBTCompoundImpl(compound.getCompound(tag));
+    }
 }
diff --git a/NMS/NMS-v1_16_R1/pom.xml b/NMS/NMS-v1_16_R1/pom.xml
index dbd2f8c5..8e27c03e 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.4.12</version>
+        <version>2.4.13</version>
         <relativePath>../../</relativePath>
     </parent>
 
diff --git a/NMS/NMS-v1_16_R1/src/com/songoda/core/nms/v1_16_R1/nbt/NBTCompoundImpl.java b/NMS/NMS-v1_16_R1/src/com/songoda/core/nms/v1_16_R1/nbt/NBTCompoundImpl.java
index 13e76e68..93e0972e 100644
--- a/NMS/NMS-v1_16_R1/src/com/songoda/core/nms/v1_16_R1/nbt/NBTCompoundImpl.java
+++ b/NMS/NMS-v1_16_R1/src/com/songoda/core/nms/v1_16_R1/nbt/NBTCompoundImpl.java
@@ -14,7 +14,7 @@ import java.io.OutputStream;
 import java.util.Set;
 import java.util.UUID;
 
-public abstract class NBTCompoundImpl implements NBTCompound {
+public class NBTCompoundImpl implements NBTCompound {
 
     protected NBTTagCompound compound;
 
@@ -143,7 +143,7 @@ public abstract class NBTCompoundImpl implements NBTCompound {
 
     @Override
     public Set<String> getKeys(String tag) {
-        return compound.getCompound(tag).getKeys();
+        return getNBTObject(tag).getKeys();
     }
 
     @Override
@@ -175,4 +175,8 @@ public abstract class NBTCompoundImpl implements NBTCompound {
         }
     }
 
+    @Override
+    public void addExtras() {
+        // None
+    }
 }
diff --git a/NMS/NMS-v1_16_R1/src/com/songoda/core/nms/v1_16_R1/nbt/NBTObjectImpl.java b/NMS/NMS-v1_16_R1/src/com/songoda/core/nms/v1_16_R1/nbt/NBTObjectImpl.java
index c3de8c6c..2015b215 100644
--- a/NMS/NMS-v1_16_R1/src/com/songoda/core/nms/v1_16_R1/nbt/NBTObjectImpl.java
+++ b/NMS/NMS-v1_16_R1/src/com/songoda/core/nms/v1_16_R1/nbt/NBTObjectImpl.java
@@ -1,8 +1,11 @@
 package com.songoda.core.nms.v1_16_R1.nbt;
 
+import com.songoda.core.nms.nbt.NBTCompound;
 import com.songoda.core.nms.nbt.NBTObject;
 import net.minecraft.server.v1_16_R1.NBTTagCompound;
 
+import java.util.Set;
+
 public class NBTObjectImpl implements NBTObject {
 
     private final NBTTagCompound compound;
@@ -53,4 +56,13 @@ public class NBTObjectImpl implements NBTObject {
         return compound.getIntArray(tag);
     }
 
+    @Override
+    public Set<String> getKeys() {
+        return compound.getKeys();
+    }
+
+    @Override
+    public NBTCompound getCompound(String tag) {
+        return new NBTCompoundImpl(compound.getCompound(tag));
+    }
 }
diff --git a/NMS/NMS-v1_16_R2/pom.xml b/NMS/NMS-v1_16_R2/pom.xml
index 20211784..31fbc58e 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.4.12</version>
+        <version>2.4.13</version>
         <relativePath>../../</relativePath>
     </parent>
 
diff --git a/NMS/NMS-v1_16_R2/src/com/songoda/core/nms/v1_16_R2/nbt/NBTCompoundImpl.java b/NMS/NMS-v1_16_R2/src/com/songoda/core/nms/v1_16_R2/nbt/NBTCompoundImpl.java
index 912de14c..5659620e 100644
--- a/NMS/NMS-v1_16_R2/src/com/songoda/core/nms/v1_16_R2/nbt/NBTCompoundImpl.java
+++ b/NMS/NMS-v1_16_R2/src/com/songoda/core/nms/v1_16_R2/nbt/NBTCompoundImpl.java
@@ -14,7 +14,7 @@ import java.io.OutputStream;
 import java.util.Set;
 import java.util.UUID;
 
-public abstract class NBTCompoundImpl implements NBTCompound {
+public class NBTCompoundImpl implements NBTCompound {
 
     protected NBTTagCompound compound;
 
@@ -175,4 +175,8 @@ public abstract class NBTCompoundImpl implements NBTCompound {
         }
     }
 
+    @Override
+    public void addExtras() {
+        // None
+    }
 }
diff --git a/NMS/NMS-v1_16_R2/src/com/songoda/core/nms/v1_16_R2/nbt/NBTObjectImpl.java b/NMS/NMS-v1_16_R2/src/com/songoda/core/nms/v1_16_R2/nbt/NBTObjectImpl.java
index cd7a6319..2c8f9c78 100644
--- a/NMS/NMS-v1_16_R2/src/com/songoda/core/nms/v1_16_R2/nbt/NBTObjectImpl.java
+++ b/NMS/NMS-v1_16_R2/src/com/songoda/core/nms/v1_16_R2/nbt/NBTObjectImpl.java
@@ -1,5 +1,6 @@
 package com.songoda.core.nms.v1_16_R2.nbt;
 
+import com.songoda.core.nms.nbt.NBTCompound;
 import com.songoda.core.nms.nbt.NBTObject;
 import net.minecraft.server.v1_16_R2.NBTTagCompound;
 
@@ -55,4 +56,13 @@ public class NBTObjectImpl implements NBTObject {
         return compound.getIntArray(tag);
     }
 
+    @Override
+    public Set<String> getKeys() {
+        return compound.getKeys();
+    }
+
+    @Override
+    public NBTCompound getCompound(String tag) {
+        return new NBTCompoundImpl(compound.getCompound(tag));
+    }
 }
diff --git a/NMS/NMS-v1_8_R1/pom.xml b/NMS/NMS-v1_8_R1/pom.xml
index 9c955706..131eedbc 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.4.12</version>
+        <version>2.4.13</version>
         <relativePath>../../</relativePath>
     </parent>
 
diff --git a/NMS/NMS-v1_8_R1/src/com/songoda/core/nms/v1_8_R1/nbt/NBTCompoundImpl.java b/NMS/NMS-v1_8_R1/src/com/songoda/core/nms/v1_8_R1/nbt/NBTCompoundImpl.java
index 6551dc14..72b7ab67 100644
--- a/NMS/NMS-v1_8_R1/src/com/songoda/core/nms/v1_8_R1/nbt/NBTCompoundImpl.java
+++ b/NMS/NMS-v1_8_R1/src/com/songoda/core/nms/v1_8_R1/nbt/NBTCompoundImpl.java
@@ -14,7 +14,7 @@ import java.io.OutputStream;
 import java.util.Set;
 import java.util.UUID;
 
-public abstract class NBTCompoundImpl implements NBTCompound {
+public class NBTCompoundImpl implements NBTCompound {
 
     protected NBTTagCompound compound;
 
@@ -144,7 +144,7 @@ public abstract class NBTCompoundImpl implements NBTCompound {
 
     @Override
     public Set<String> getKeys(String tag) {
-        return compound.getCompound(tag).c();
+        return getNBTObject(tag).getKeys();
     }
 
     @Override
@@ -176,4 +176,9 @@ public abstract class NBTCompoundImpl implements NBTCompound {
         }
     }
 
+    @Override
+    public void addExtras() {
+        // None
+    }
+
 }
diff --git a/NMS/NMS-v1_8_R1/src/com/songoda/core/nms/v1_8_R1/nbt/NBTObjectImpl.java b/NMS/NMS-v1_8_R1/src/com/songoda/core/nms/v1_8_R1/nbt/NBTObjectImpl.java
index 889c259f..ed0bde24 100644
--- a/NMS/NMS-v1_8_R1/src/com/songoda/core/nms/v1_8_R1/nbt/NBTObjectImpl.java
+++ b/NMS/NMS-v1_8_R1/src/com/songoda/core/nms/v1_8_R1/nbt/NBTObjectImpl.java
@@ -1,8 +1,11 @@
 package com.songoda.core.nms.v1_8_R1.nbt;
 
+import com.songoda.core.nms.nbt.NBTCompound;
 import com.songoda.core.nms.nbt.NBTObject;
 import net.minecraft.server.v1_8_R1.NBTTagCompound;
 
+import java.util.Set;
+
 public class NBTObjectImpl implements NBTObject {
 
     private final NBTTagCompound compound;
@@ -53,4 +56,13 @@ public class NBTObjectImpl implements NBTObject {
         return compound.getIntArray(tag);
     }
 
+    @Override
+    public Set<String> getKeys() {
+        return compound.c();
+    }
+
+    @Override
+    public NBTCompound getCompound(String tag) {
+        return new NBTCompoundImpl(compound.getCompound(tag));
+    }
 }
diff --git a/NMS/NMS-v1_8_R2/pom.xml b/NMS/NMS-v1_8_R2/pom.xml
index 2128a096..308be609 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.4.12</version>
+        <version>2.4.13</version>
         <relativePath>../../</relativePath>
     </parent>
 
diff --git a/NMS/NMS-v1_8_R2/src/com/songoda/core/nms/v1_8_R2/nbt/NBTCompoundImpl.java b/NMS/NMS-v1_8_R2/src/com/songoda/core/nms/v1_8_R2/nbt/NBTCompoundImpl.java
index 66de8084..092c4518 100644
--- a/NMS/NMS-v1_8_R2/src/com/songoda/core/nms/v1_8_R2/nbt/NBTCompoundImpl.java
+++ b/NMS/NMS-v1_8_R2/src/com/songoda/core/nms/v1_8_R2/nbt/NBTCompoundImpl.java
@@ -14,7 +14,7 @@ import java.io.OutputStream;
 import java.util.Set;
 import java.util.UUID;
 
-public abstract class NBTCompoundImpl implements NBTCompound {
+public class NBTCompoundImpl implements NBTCompound {
 
     protected NBTTagCompound compound;
 
@@ -144,7 +144,7 @@ public abstract class NBTCompoundImpl implements NBTCompound {
 
     @Override
     public Set<String> getKeys(String tag) {
-        return compound.getCompound(tag).c();
+        return getNBTObject(tag).getKeys();
     }
 
     @Override
@@ -176,4 +176,8 @@ public abstract class NBTCompoundImpl implements NBTCompound {
         }
     }
 
+    @Override
+    public void addExtras() {
+        // None
+    }
 }
diff --git a/NMS/NMS-v1_8_R2/src/com/songoda/core/nms/v1_8_R2/nbt/NBTObjectImpl.java b/NMS/NMS-v1_8_R2/src/com/songoda/core/nms/v1_8_R2/nbt/NBTObjectImpl.java
index c42bb411..04c00aa0 100644
--- a/NMS/NMS-v1_8_R2/src/com/songoda/core/nms/v1_8_R2/nbt/NBTObjectImpl.java
+++ b/NMS/NMS-v1_8_R2/src/com/songoda/core/nms/v1_8_R2/nbt/NBTObjectImpl.java
@@ -1,8 +1,11 @@
 package com.songoda.core.nms.v1_8_R2.nbt;
 
+import com.songoda.core.nms.nbt.NBTCompound;
 import com.songoda.core.nms.nbt.NBTObject;
 import net.minecraft.server.v1_8_R2.NBTTagCompound;
 
+import java.util.Set;
+
 public class NBTObjectImpl implements NBTObject {
 
     private final NBTTagCompound compound;
@@ -53,4 +56,13 @@ public class NBTObjectImpl implements NBTObject {
         return compound.getIntArray(tag);
     }
 
+    @Override
+    public Set<String> getKeys() {
+        return compound.c();
+    }
+
+    @Override
+    public NBTCompound getCompound(String tag) {
+        return new NBTCompoundImpl(compound.getCompound(tag));
+    }
 }
diff --git a/NMS/NMS-v1_8_R3/pom.xml b/NMS/NMS-v1_8_R3/pom.xml
index ad69143c..ecc53975 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.4.12</version>
+        <version>2.4.13</version>
         <relativePath>../../</relativePath>
     </parent>
 
diff --git a/NMS/NMS-v1_8_R3/src/com/songoda/core/nms/v1_8_R3/nbt/NBTCompoundImpl.java b/NMS/NMS-v1_8_R3/src/com/songoda/core/nms/v1_8_R3/nbt/NBTCompoundImpl.java
index 8bbd163d..e48669cf 100644
--- a/NMS/NMS-v1_8_R3/src/com/songoda/core/nms/v1_8_R3/nbt/NBTCompoundImpl.java
+++ b/NMS/NMS-v1_8_R3/src/com/songoda/core/nms/v1_8_R3/nbt/NBTCompoundImpl.java
@@ -14,7 +14,7 @@ import java.io.OutputStream;
 import java.util.Set;
 import java.util.UUID;
 
-public abstract class NBTCompoundImpl implements NBTCompound {
+public class NBTCompoundImpl implements NBTCompound {
 
     protected NBTTagCompound compound;
 
@@ -144,7 +144,7 @@ public abstract class NBTCompoundImpl implements NBTCompound {
 
     @Override
     public Set<String> getKeys(String tag) {
-        return compound.getCompound(tag).c();
+        return getNBTObject(tag).getKeys();
     }
 
     @Override
@@ -176,4 +176,8 @@ public abstract class NBTCompoundImpl implements NBTCompound {
         }
     }
 
+    @Override
+    public void addExtras() {
+        // None
+    }
 }
diff --git a/NMS/NMS-v1_8_R3/src/com/songoda/core/nms/v1_8_R3/nbt/NBTObjectImpl.java b/NMS/NMS-v1_8_R3/src/com/songoda/core/nms/v1_8_R3/nbt/NBTObjectImpl.java
index 7440d8d3..329471b1 100644
--- a/NMS/NMS-v1_8_R3/src/com/songoda/core/nms/v1_8_R3/nbt/NBTObjectImpl.java
+++ b/NMS/NMS-v1_8_R3/src/com/songoda/core/nms/v1_8_R3/nbt/NBTObjectImpl.java
@@ -1,8 +1,11 @@
 package com.songoda.core.nms.v1_8_R3.nbt;
 
+import com.songoda.core.nms.nbt.NBTCompound;
 import com.songoda.core.nms.nbt.NBTObject;
 import net.minecraft.server.v1_8_R3.NBTTagCompound;
 
+import java.util.Set;
+
 public class NBTObjectImpl implements NBTObject {
 
     private final NBTTagCompound compound;
@@ -53,4 +56,13 @@ public class NBTObjectImpl implements NBTObject {
         return compound.getIntArray(tag);
     }
 
+    @Override
+    public Set<String> getKeys() {
+        return compound.c();
+    }
+
+    @Override
+    public NBTCompound getCompound(String tag) {
+        return new NBTCompoundImpl(compound.getCompound(tag));
+    }
 }
diff --git a/NMS/NMS-v1_9_R1/pom.xml b/NMS/NMS-v1_9_R1/pom.xml
index 989663b3..547d4922 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.4.12</version>
+        <version>2.4.13</version>
         <relativePath>../../</relativePath>
     </parent>
 
diff --git a/NMS/NMS-v1_9_R1/src/com/songoda/core/nms/v1_9_R1/nbt/NBTCompoundImpl.java b/NMS/NMS-v1_9_R1/src/com/songoda/core/nms/v1_9_R1/nbt/NBTCompoundImpl.java
index e9222124..3c54dd58 100644
--- a/NMS/NMS-v1_9_R1/src/com/songoda/core/nms/v1_9_R1/nbt/NBTCompoundImpl.java
+++ b/NMS/NMS-v1_9_R1/src/com/songoda/core/nms/v1_9_R1/nbt/NBTCompoundImpl.java
@@ -14,7 +14,7 @@ import java.io.OutputStream;
 import java.util.Set;
 import java.util.UUID;
 
-public abstract class NBTCompoundImpl implements NBTCompound {
+public class NBTCompoundImpl implements NBTCompound {
 
     protected NBTTagCompound compound;
 
@@ -143,7 +143,7 @@ public abstract class NBTCompoundImpl implements NBTCompound {
 
     @Override
     public Set<String> getKeys(String tag) {
-        return compound.getCompound(tag).c();
+        return getNBTObject(tag).getKeys();
     }
 
     @Override
@@ -175,4 +175,8 @@ public abstract class NBTCompoundImpl implements NBTCompound {
         }
     }
 
+    @Override
+    public void addExtras() {
+        // None
+    }
 }
diff --git a/NMS/NMS-v1_9_R1/src/com/songoda/core/nms/v1_9_R1/nbt/NBTObjectImpl.java b/NMS/NMS-v1_9_R1/src/com/songoda/core/nms/v1_9_R1/nbt/NBTObjectImpl.java
index b82bbc91..158eb4c1 100644
--- a/NMS/NMS-v1_9_R1/src/com/songoda/core/nms/v1_9_R1/nbt/NBTObjectImpl.java
+++ b/NMS/NMS-v1_9_R1/src/com/songoda/core/nms/v1_9_R1/nbt/NBTObjectImpl.java
@@ -1,8 +1,11 @@
 package com.songoda.core.nms.v1_9_R1.nbt;
 
+import com.songoda.core.nms.nbt.NBTCompound;
 import com.songoda.core.nms.nbt.NBTObject;
 import net.minecraft.server.v1_9_R1.NBTTagCompound;
 
+import java.util.Set;
+
 public class NBTObjectImpl implements NBTObject {
 
     private final NBTTagCompound compound;
@@ -53,4 +56,13 @@ public class NBTObjectImpl implements NBTObject {
         return compound.getIntArray(tag);
     }
 
+    @Override
+    public Set<String> getKeys() {
+        return compound.c();
+    }
+
+    @Override
+    public NBTCompound getCompound(String tag) {
+        return new NBTCompoundImpl(compound.getCompound(tag));
+    }
 }
diff --git a/NMS/NMS-v1_9_R2/pom.xml b/NMS/NMS-v1_9_R2/pom.xml
index 0c9a82f7..e3871647 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.4.12</version>
+        <version>2.4.13</version>
         <relativePath>../../</relativePath>
     </parent>
 
diff --git a/NMS/NMS-v1_9_R2/src/com/songoda/core/nms/v1_9_R2/nbt/NBTCompoundImpl.java b/NMS/NMS-v1_9_R2/src/com/songoda/core/nms/v1_9_R2/nbt/NBTCompoundImpl.java
index ab80c0ba..1a55e7ae 100644
--- a/NMS/NMS-v1_9_R2/src/com/songoda/core/nms/v1_9_R2/nbt/NBTCompoundImpl.java
+++ b/NMS/NMS-v1_9_R2/src/com/songoda/core/nms/v1_9_R2/nbt/NBTCompoundImpl.java
@@ -14,7 +14,7 @@ import java.io.OutputStream;
 import java.util.Set;
 import java.util.UUID;
 
-public abstract class NBTCompoundImpl implements NBTCompound {
+public class NBTCompoundImpl implements NBTCompound {
 
     protected NBTTagCompound compound;
 
@@ -143,7 +143,7 @@ public abstract class NBTCompoundImpl implements NBTCompound {
 
     @Override
     public Set<String> getKeys(String tag) {
-        return compound.getCompound(tag).c();
+        return getNBTObject(tag).getKeys();
     }
 
     @Override
@@ -175,4 +175,8 @@ public abstract class NBTCompoundImpl implements NBTCompound {
         }
     }
 
+    @Override
+    public void addExtras() {
+        // None
+    }
 }
diff --git a/NMS/NMS-v1_9_R2/src/com/songoda/core/nms/v1_9_R2/nbt/NBTObjectImpl.java b/NMS/NMS-v1_9_R2/src/com/songoda/core/nms/v1_9_R2/nbt/NBTObjectImpl.java
index b52bbb01..eedd64c4 100644
--- a/NMS/NMS-v1_9_R2/src/com/songoda/core/nms/v1_9_R2/nbt/NBTObjectImpl.java
+++ b/NMS/NMS-v1_9_R2/src/com/songoda/core/nms/v1_9_R2/nbt/NBTObjectImpl.java
@@ -1,8 +1,11 @@
 package com.songoda.core.nms.v1_9_R2.nbt;
 
+import com.songoda.core.nms.nbt.NBTCompound;
 import com.songoda.core.nms.nbt.NBTObject;
 import net.minecraft.server.v1_9_R2.NBTTagCompound;
 
+import java.util.Set;
+
 public class NBTObjectImpl implements NBTObject {
 
     private final NBTTagCompound compound;
@@ -53,4 +56,13 @@ public class NBTObjectImpl implements NBTObject {
         return compound.getIntArray(tag);
     }
 
+    @Override
+    public Set<String> getKeys() {
+        return compound.c();
+    }
+
+    @Override
+    public NBTCompound getCompound(String tag) {
+        return new NBTCompoundImpl(compound.getCompound(tag));
+    }
 }
diff --git a/pom.xml b/pom.xml
index e374dc8a..434c0dad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
 
     <groupId>com.songoda</groupId>
     <artifactId>SongodaCore-Modules</artifactId>
-    <version>2.4.12</version>
+    <version>2.4.13</version>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>