Reduced the scope of the clients we will make compatible w/ MapReduce