CORE: Restructured data for save/load states