Changes to CustomLexer