New solution for Lexer