Added watcher util