Add missing model setters&getters.
Merge branch 'feature/model' into develop