Used the token type instead of strings