added more watchdog support