Improve watchdog subscriber