work on XDI and plugins