CMSMS 1.11 compatibility