support for CMSMS 1.12+