Added token types to states.