Updates to the image mapping tools