Improve the watchdog subscriber