Add TokenType attribute to specify whether the token is a primary or