Compatibility with CMSMS 1.11