Updated the lexer to include more tokens