updated data model [finishes #75988684]