Adjusted the way we set the types of tokens.