update to the new data model