Refactor the data model design.