Added TokenQuery support