Added type for Map parsing