Added map for dictionaries and strings