*** Some RPC demo's enhancements