Changes for hadoop