Made it work with the new live stream lexer