Added the possibility to skip the image creation.