Enhanced parser