diff --git a/writeengine/redistribute/we_redistributeworkerthread.cpp b/writeengine/redistribute/we_redistributeworkerthread.cpp
index 267cb2220..c16a0a82e 100644
--- a/writeengine/redistribute/we_redistributeworkerthread.cpp
+++ b/writeengine/redistribute/we_redistributeworkerthread.cpp
@@ -486,8 +486,9 @@ int RedistributeWorkerThread::sendData()
     int16_t source = fPlanEntry.source;
     int16_t dest = fPlanEntry.destination;
 
-    IDBDataFile::Types fileType =
-        (IDBPolicy::useHdfs() ? IDBDataFile::HDFS : IDBDataFile::UNBUFFERED);
+    IDBDataFile::Types fileType = (IDBPolicy::useHdfs() ? IDBDataFile::HDFS :
+            IDBPolicy::useCloud() ? IDBDataFile::CLOUD : IDBDataFile::UNBUFFERED);
+
     IDBFileSystem& fs = IDBFileSystem::getFs( fileType );
 
     if ((remotePM) && (fileType != IDBDataFile::HDFS))
@@ -1519,8 +1520,11 @@ void RedistributeWorkerThread::handleDataAbort(SBS& sbs, size_t& size)
     if (fNewFilePtr != NULL)
         closeFile(fNewFilePtr);
 
-    IDBFileSystem& fs = IDBFileSystem::getFs(
-                            (IDBPolicy::useHdfs() ? IDBDataFile::HDFS : IDBDataFile::UNBUFFERED) );
+    IDBFileSystem& fs = (IDBPolicy::useHdfs() ?
+        IDBFileSystem::getFs(IDBDataFile::HDFS) :
+        IDBPolicy::useCloud() ?
+            IDBFileSystem::getFs(IDBDataFile::CLOUD) :
+            IDBFileSystem::getFs(IDBDataFile::BUFFERED));
 
     // remove local files
     for (set<string>::iterator i = fNewDirSet.begin(); i != fNewDirSet.end(); i++)
diff --git a/writeengine/server/we_getfilesizes.cpp b/writeengine/server/we_getfilesizes.cpp
index 5e408d4e5..3a597ff69 100644
--- a/writeengine/server/we_getfilesizes.cpp
+++ b/writeengine/server/we_getfilesizes.cpp
@@ -183,6 +183,8 @@ struct ColumnThread
 
         if (bUsingHdfs)
             fileType = IDBDataFile::HDFS;
+        else if (IDBPolicy::useCloud())
+            fileType = IDBDataFile::CLOUD;
         else
             fileType = IDBDataFile::UNBUFFERED;
 
diff --git a/writeengine/shared/we_confirmhdfsdbfile.cpp b/writeengine/shared/we_confirmhdfsdbfile.cpp
index b749c9603..ec1483e12 100644
--- a/writeengine/shared/we_confirmhdfsdbfile.cpp
+++ b/writeengine/shared/we_confirmhdfsdbfile.cpp
@@ -49,9 +49,11 @@ namespace WriteEngine
 // on useHdfs() to tell me which FileSystem reference to get.
 //------------------------------------------------------------------------------
 ConfirmHdfsDbFile::ConfirmHdfsDbFile() :
-    fFs( (idbdatafile::IDBPolicy::useHdfs()) ?
-         idbdatafile::IDBFileSystem::getFs(idbdatafile::IDBDataFile::HDFS) :
-         idbdatafile::IDBFileSystem::getFs(idbdatafile::IDBDataFile::BUFFERED))
+    fFs(idbdatafile::IDBPolicy::useHdfs() ?
+        idbdatafile::IDBFileSystem::getFs(idbdatafile::IDBDataFile::HDFS) :
+        idbdatafile::IDBPolicy::useCloud() ?
+            idbdatafile::IDBFileSystem::getFs(idbdatafile::IDBDataFile::CLOUD) :
+            idbdatafile::IDBFileSystem::getFs(idbdatafile::IDBDataFile::BUFFERED))
 {
 }