Image Importer code refactored.