Update to cm support for 4.4

closes #197