Ready for CMSMS 2.x (enhancement #2)