Work on being cmsms 2.2.9 and 2.3 compatible at the same time