Update to reflect new model APIs
Merge branch 'develop' of github.com:wukong-m2m/wukong-darjeeling into develop