Refactoring models, and adding new ones