Updated the fetcher