Now saves NBT data properly