Updated for CMSMS 1.9