Changes for hadoop version 2.2