Updates to use Hadoop FileSystem