Feature/1 data model