Latest changes for image type to be a variable.