[SERVICES] Improvements to registry control sets