Added TokenType stuff