Add Watcher scaffold