Add img enclosure support