CFY-888 refactored controllers