Added watcher class