Refactored more models.