Rework how the access token is configured and retrived for querying.