Add Watcher pattern