Updated/New Composer support for XML_RDDL

See diff for full changes