Compatible with CMSMS 2.0