[FIX, FEATURE] Enhanced parser.