Additional Enhancements to the Endpoint RPC Registration