Refactoring in the models.