Refactor to fit with upcoming structures nbt storage