ControllerHandler logic updated