Updated to return watcher objects