CM.Controller refactored