--- a/Samples/WebAssembly/SingleFrameViewer/SingleFrameViewer.cpp	Mon Apr 27 16:49:03 2020 +0200
+++ b/Samples/WebAssembly/SingleFrameViewer/SingleFrameViewer.cpp	Tue Apr 28 08:57:39 2020 +0200
@@ -44,37 +44,11 @@
 
 namespace OrthancStone
 {
-  class Observer : public IWebViewerLoadersObserver
-  {
-  public:
-    virtual void SignalSeriesUpdated(LoadedDicomResources& series)
-    {
-      LOG(INFO) << "=====================================";
-      LOG(INFO) << series.GetSize() << " series";
-
-      /*for (size_t i = 0; i < series.GetSize(); i++)
-        {
-        series.GetResource(i).Print(stdout);
-        printf("\n");
-        }*/
-    }
-    
-    virtual void SignalThumbnailLoaded(const std::string& studyInstanceUid,
-                                       const std::string& seriesInstanceUid,
-                                       SeriesThumbnailType type)
-    {
-      LOG(INFO) << "*** Thumbnail loaded: " << studyInstanceUid << " / "
-                << seriesInstanceUid << " (type " << type << ")";
-    }
-  };
 }
 
-
-
 static std::auto_ptr<OrthancStone::WebAssemblyLoadersContext>  context_;
 static boost::shared_ptr<OrthancStone::Application>  application_;
 
-
 extern "C"
 {
   int main(int argc, char const *argv[]) 
@@ -95,13 +69,12 @@
       context_->SetLocalOrthanc("..");
       context_->SetDicomCacheSize(128 * 1024 * 1024);  // 128MB
   
-      DISPATCH_JAVASCRIPT_EVENT("StoneInitialized");
+      DISPATCH_JAVASCRIPT_EVENT("WasmModuleInitialized");
     }
     EXTERN_CATCH_EXCEPTIONS;
 
     return 0;
   }
-
   
   EMSCRIPTEN_KEEPALIVE
   void InitializeViewport(const char* canvasId)
@@ -120,43 +93,9 @@
                                         "Only one single viewport is available for this application");
       }
 
-      {
-        std::auto_ptr<OrthancStone::Observer> observer(new OrthancStone::Observer);
-      
-#if 1
-        OrthancStone::DicomSource source1;
-        //source1.SetDicomWebSource("http://localhost:8042/dicom-web");  source1.SetDicomWebRendered(true);
-        source1.SetDicomWebThroughOrthancSource("self");  source1.SetDicomWebRendered(true);
-        //source1.SetDicomWebThroughOrthancSource("my-google");  source1.SetDicomWebRendered(false);
-        boost::shared_ptr<OrthancStone::WebViewerLoaders> app2(
-          OrthancStone::WebViewerLoaders::Create(*context_, source1, true, observer.release()));
-#else
-        OrthancStone::DicomSource source1;
-        source1.SetOrthancSource();
-        boost::shared_ptr<OrthancStone::WebViewerLoaders> app2(
-          OrthancStone::WebViewerLoaders::Create(*context_, source1, true, observer.release()));
-        //app2->AddOrthancStudy("27f7126f-4f66fb14-03f4081b-f9341db2-53925988");
-        //app2->AddOrthancSeries("1e2c125c-411b8e86-3f4fe68e-a7584dd3-c6da78f0");
-#endif
-
-        // BRAINIX
-        //app2->AddDicomAllSeries();
-        //app2->AddDicomStudy("2.16.840.1.113669.632.20.1211.10000357775");
-        app2->AddDicomSeries("2.16.840.1.113669.632.20.1211.10000357775", "1.3.46.670589.11.0.0.11.4.2.0.8743.5.3800.2006120117110979000"); // Standard image: type 5
-
-        app2->AddDicomStudy("1.3.51.0.7.633920140505.6339234439.633987.633918098");  // "Video" type 4: video720p.dcm
-        app2->AddDicomStudy("1.2.276.0.7230010.3.1.2.2344313775.14992.1458058404.7528");  // "PDF" type 3: pdf.dcm  
-        app2->AddDicomSeries("1.2.276.0.7230010.3.1.2.296485376.1.1568899779.944131", "1.2.276.0.7230010.3.1.3.296485376.1.1568899781.944588"); // RTSTRUCT, "Unsupported" type 2: DICOM/WebViewer2/TFE/IMAGES/IM452
-
-      
-        //app2->AddDicomStudy("1.2.276.0.7230010.3.1.2.380371456.1.1544616291.954997");  // CSPO
-      }
-
       boost::shared_ptr<OrthancStone::WebGLViewport> viewport(OrthancStone::GetWebGLViewportsRegistry().Add(canvasId));
       application_ = OrthancStone::Application::Create(*context_, viewport);
 
-      // Paint the viewport to black
-      
       {
         OrthancStone::WebGLViewportsRegistry::Accessor accessor(
           OrthancStone::GetWebGLViewportsRegistry(), canvasId);
@@ -172,8 +111,8 @@
 
   
   EMSCRIPTEN_KEEPALIVE
-  void LoadOrthanc(const char* instance,
-                   int frame)
+  void LoadFromOrthanc(const char* instance,
+                       int frame)
   {
     try
     {
@@ -188,11 +127,11 @@
 
   
   EMSCRIPTEN_KEEPALIVE
-  void LoadDicomWeb(const char* server,
-                    const char* studyInstanceUid,
-                    const char* seriesInstanceUid,
-                    const char* sopInstanceUid,
-                    int frame)
+  void LoadFromDicomWeb(const char* server,
+                        const char* studyInstanceUid,
+                        const char* seriesInstanceUid,
+                        const char* sopInstanceUid,
+                        int frame)
   {
     try
     {