Make the watchdog generic