Use maps instead of arrays for some of the RPC data passing