more work on XDI in Demeter and Athena