Changes on Parser to parse the Map correctly