Added token_count type