Refactored to match new models.