Enhanced XDXF support (by soshial)