Updated/New Composer support for XML_Tree

See diff for full changes