Adding separate map-based parsing.