More work on RPC Server