Upgraded for CMSMS 1.10