redesigned data model