Adding support for images.