Added and refactored models.