Simplify handling multiple Hadoop versions