Changes for image module