Update to allow Service group creation