Updated/New Composer support for XML_Indexing

See diff for full changes