ImageLoader refactoring