Refactored some models.