re designed data model