Updated the data model