Added event watcher