Improved the parser.