Moving towards two separate parsers