#2 Updated the data model