Updated with new XDI2 interfaces