Added more functions to lexer-new.rs