Updated MapEntryRead/Query.