Change to new schema for alerting