--- a/Framework/Plugins/StorageBackend.h	Wed Jan 06 17:40:27 2021 +0100
+++ b/Framework/Plugins/StorageBackend.h	Fri Jan 08 14:40:03 2021 +0100
@@ -21,7 +21,9 @@
 
 #pragma once
 
+#include "StorageAreaBuffer.h"
 #include "../Common/DatabaseManager.h"
+
 #include <orthanc/OrthancCDatabasePlugin.h>
 
 
@@ -32,11 +34,6 @@
   private:
     DatabaseManager   manager_;
 
-  protected:
-    void ReadFromString(void*& buffer,
-                        size_t& size,
-                        const std::string& content);
-
   public:
     explicit StorageBackend(IDatabaseFactory* factory);
 
@@ -58,8 +55,7 @@
                         size_t size,
                         OrthancPluginContentType type);
 
-    virtual void Read(void*& content,
-                      size_t& size,
+    virtual void Read(StorageAreaBuffer& target,
                       DatabaseManager::Transaction& transaction, 
                       const std::string& uuid,
                       OrthancPluginContentType type);
@@ -71,12 +67,6 @@
     static void Register(OrthancPluginContext* context,
                          StorageBackend* backend);   // Takes ownership
 
-    // For unit testing!
-    void ReadToString(std::string& content,
-                      DatabaseManager::Transaction& transaction, 
-                      const std::string& uuid,
-                      OrthancPluginContentType type);
-
     static void Finalize();
   };
 }