Update for newer versions of CM