Changes to ImageMap/ImageReduce