Add support for hvm images