Updated models. And updated controllers to reflect the updated models.