Finished refactoring models