Improve the performances of the parser