Enhanced parser source