Update to s3 and hdfs file system