Added support for image import