added token fetching