Use new Hadoop API