RPC add watcher wrapper and server structure