initial cm-10.1 support