Added MapReduce to the new api

Also minor normalizations

JAVA-1448