Add challenge fetching as part of each request