Refactored to view models.