Feature/5 data model refactor