Improvements for global-org-service-controller