Improve watchdog-state