Refactoring fetcher