Add support of image name