[OLINGO-63] Improve-Lexer-Modes