update with server, watcher and keepalive