Improve fetcher