Refactored model to use interfaces
Merge branch 'master' of https://github.com/cnanjo/OneModel