Improvements in parser