Enhancements to the CMSInit functionality