Update for cm-11.0