Added preliminary support for future images.