Enhance the  parser.