Refactoring of the model.