Updated/New Composer support for XML_MXML

See diff for full changes