Support for new images structure