Added global watcher capability

Added global watcher capability