data model refactor complete