Improved ImageFetcher code.