Few changes
Merge branch 'new-datamodel' of github.com:servioticy/servioticy-api-public into new-datamodel