Improved Lexer + C# API