Added watchdog option