Add watcher option

Ref #818