Further improvements in the parser