--- a/OrthancServer/OrthancRestApi2.h	Thu Nov 29 18:07:50 2012 +0100
+++ b/OrthancServer/OrthancRestApi2.h	Thu Nov 29 22:22:00 2012 +0100
@@ -32,7 +32,7 @@
 
 #pragma once
 
-#include "ServerIndex.h"
+#include "ServerContext.h"
 #include "../Core/RestApi/RestApi.h"
 
 #include <set>
@@ -45,22 +45,15 @@
     typedef std::set<std::string> Modalities;
 
   private:
-    ServerIndex& index_;
-    FileStorage storage_;
+    ServerContext& context_;
     Modalities modalities_;
 
   public:
-    OrthancRestApi2(ServerIndex& index,
-                    const std::string& path);
+    OrthancRestApi2(ServerContext& context);
 
-    ServerIndex& GetIndex()
+    ServerContext& GetContext()
     {
-      return index_;
-    }
-    
-    FileStorage& GetFileStorage()
-    {
-      return storage_;
+      return context_;
     }
 
     Modalities& GetModalities()