--- a/Orthanc/FileStorage/FilesystemStorage.h	Fri May 29 11:07:38 2015 +0200
+++ b/Orthanc/FileStorage/FilesystemStorage.h	Mon Jun 01 11:52:28 2015 +0200
@@ -32,14 +32,19 @@
 
 #pragma once
 
+#include "IStorageArea.h"
+
 #include <boost/filesystem.hpp>
 #include <set>
-#include <stdint.h>
 
 namespace Orthanc
 {
-  class FilesystemStorage : public boost::noncopyable
+  class FilesystemStorage : public IStorageArea
   {
+    // TODO REMOVE THIS
+    friend class FilesystemHttpSender;
+    friend class FileStorageAccessor;
+
   private:
     boost::filesystem::path root_;
 
@@ -50,12 +55,15 @@
 
     virtual void Create(const std::string& uuid,
                         const void* content, 
-                        size_t size);
+                        size_t size,
+                        FileContentType type);
 
     virtual void Read(std::string& content,
-                      const std::string& uuid);
+                      const std::string& uuid,
+                      FileContentType type);
 
-    virtual void Remove(const std::string& uuid);
+    virtual void Remove(const std::string& uuid,
+                        FileContentType type);
 
     void ListAllFiles(std::set<std::string>& result) const;