Updated/New Composer support for XML_DTD

See diff for full changes