ImageDownloader refactored