Modified for CMSMS 2.x