Added hadoop support