added access token support in query