Adding XDS support