Added ability to specify images from raw data.