Further enhancements for image support. Additional parameter for the number of images which should be returned.