Refactoring the models a bit