Updated the RPC to match the storage interface simplification made in the main repository.