updated data model