more updates for controlplane integration