Updated NBT saving and loading to new system