Work on refactoring the models