Changes to the image callback mechanism