Updated data model