Updated/New Composer support for XML_XPath

See diff for full changes