Update code for cm-10.1