Added Watcher class
Minor update