Fix mapper/reducer interface