Could we move this class inside the proxy CM method, and therefore use the correct value for service_name?