Add watchdog to the core patch