Enhancements to CMS module