Updated fetcher