Updates for Cm-12.0