Added some more NBT saving features