Updated with CMSMS 1.9 compatibility and features.