controlplane integration improvements