Added Macro into Lexer