Added key+value equivalents for the map getters.