added watcher structure