continuing work on new XDI parser support