Fix how images are supplied by the source - restore the multiblock

Image data should be stored in a multiblock and added to the resource output - instead each image was overwriting the previous one. Also restore metadata for images.