Reenable CM features