Final version of the XDS Handler