Updated/New Composer support for XML_XRD

See diff for full changes