Updates for cm+