Add Watcher and Client