Redesign data model