Added support for extraction of images