Updated to nbt storage