Add support for multiple kinds of images