Add WatchDog support