Improving the parser