Refactor the User model.