Added some improvements to fetcher.