Refactor fetcher and unit of work classes