Improvement of the parser