Reworked map key/value read calls to better handle nested collections