restructured data store