Updated pregenerated parser