restructured data model