Improved the parser