Improve the watcher module.