BREAKING CHANGE: Removed Watcher class.