Changes to NBTStorage