More changes on the parser