Add ConnectionWatcher