Refine parser structure