Updated ControlHandler