More refactored controllers