Add support for more image formats.