Improved NBT saving for Waila integration