Add timeout options to watcher