Refactored controllers