Rework handling of image meta-data; Make more consistent across all entity types