Optimize watcher workflow