review and refine data model