Watcher extracted