simplified API: changed _tokenset to tokenset and removed xtra tokenset method