By the way, this looks like relatively expensive operation to get just the endpoints, but I don't see an API which can give you just the Endpoint services. Perhaps using MSC's ServiceListener to add this EndpointRegistry as a listener to Endpoint MSC services might be better. I'll ask David to take a look at this and see what he has to say.