Add support for ThirdPartyTokens