Further work on new parsers