Updated support for new images.