WIP for updated XDI discovery