Refactor fetcher