Lexer and Parser upgrades for better syntax analysis