updates to match XDI2 refactoring