Extended the data model