ControlLink improvements