Refactoring the model classes.