Modified ControlManager class