Refactored controllers.