Partial: RPC additions