--- a/Core/FileStorage/CompressedFileStorageAccessor.h	Tue Sep 09 10:45:14 2014 +0200
+++ b/Core/FileStorage/CompressedFileStorageAccessor.h	Tue Sep 09 12:53:49 2014 +0200
@@ -41,7 +41,7 @@
   class CompressedFileStorageAccessor : public StorageAccessor
   {
   private:
-    IStorageArea& storage_;
+    IStorageArea* storage_;
     ZlibCompressor zlib_;
     CompressionType compressionType_;
 
@@ -51,8 +51,22 @@
                                    FileContentType type);
 
   public: 
+    CompressedFileStorageAccessor();
+
     CompressedFileStorageAccessor(IStorageArea& storage);
 
+    void SetStorageArea(IStorageArea& storage)
+    {
+      storage_ = &storage;
+    }
+
+    bool HasStorageArea() const
+    {
+      return storage_ != NULL;
+    }
+
+    IStorageArea& GetStorageArea();
+
     void SetCompressionForNextOperations(CompressionType compression)
     {
       compressionType_ = compression;
@@ -71,9 +85,6 @@
                                                     FileContentType type);
 
     virtual void Remove(const std::string& uuid,
-                        FileContentType type)
-    {
-      storage_.Remove(uuid, type);
-    }
+                        FileContentType type);
   };
 }