Minor update for the Map parsing