Fixes in model
Merge branch 'master' of https://github.com/volodymyr-melnychuk/data-service.git