Refactor fetchers