Better support for image properties.