Add control plane partitioning