Updated models and controllers