Add CDM checks and alarms