Updated data model structure