Changes to the parsers