--- a/Plugins/Engine/OrthancPlugins.h	Thu May 26 14:24:56 2016 +0200
+++ b/Plugins/Engine/OrthancPlugins.h	Tue May 31 12:19:53 2016 +0200
@@ -83,8 +83,6 @@
     class FindHandler;
     class MoveHandler;
 
-    void CheckContextAvailable();
-
     void RegisterRestCallback(const void* parameters,
                               bool lock);
 
@@ -179,6 +177,14 @@
                               OrthancPluginResourceType resourceType,
                               const char* resource);
 
+    bool InvokeSafeService(SharedLibrary& plugin,
+                           _OrthancPluginService service,
+                           const void* parameters);
+
+    bool InvokeProtectedService(SharedLibrary& plugin,
+                                _OrthancPluginService service,
+                                const void* parameters);
+
   public:
     OrthancPlugins();
 
@@ -186,6 +192,8 @@
 
     void SetServerContext(ServerContext& context);
 
+    void ResetServerContext();
+
     virtual bool Handle(HttpOutput& output,
                         RequestOrigin origin,
                         const char* remoteIp,