Add model schema & shortcuts for getters/methods
Merge develop