Model based schema
Conflicts resolve
Update references defined in schema
Merge pull request #74 from Strech/object-model-schema

Object model schema