Refactored fetcher