Updated data models