Updated data model with unique ID fields.