Add support for multiple custom values and multiple images.