Now should work with modern versions of CMSMS.