Enhancements to DMComposite