Add support for extra image metadata and multiple supplementary files