Update for image handling