Use strong typing for token ID