Updating NBT to use subtags