Hopefully final changes to ImageType specification