Updated data model to be more correct