Updated parser to use maps for dicts