Initial cm-11.0 support