Add Hadoop Support