Completed first version of data model