refactor for new climate
Merge branch 'master' of https://github.com/tomay/model-manager