NF: Update for image module