Updated the parser