diff --git a/OHIFViewer/client/components/viewer/viewer.js b/OHIFViewer/client/components/viewer/viewer.js
index 4feb6fc91..62499513f 100644
--- a/OHIFViewer/client/components/viewer/viewer.js
+++ b/OHIFViewer/client/components/viewer/viewer.js
@@ -26,7 +26,7 @@ const initHangingProtocol = () => {
         const layoutManager = OHIF.viewerbase.layoutManager;
 
         // Instantiate StudyMetadataSource: necessary for Hanging Protocol to get study metadata
-        const studyMetadataSource = new OHIFStudyMetadataSource();
+        const studyMetadataSource = new StudyList.classes.OHIFStudyMetadataSource();
 
         // Creates Protocol Engine object with required arguments
         const ProtocolEngine = new HP.ProtocolEngine(layoutManager, studyMetadataList, [], studyMetadataSource);
diff --git a/Packages/ohif-study-list/client/lib/studylist.js b/Packages/ohif-study-list/client/lib/studylist.js
index b217d2a3a..47d0a8d7f 100644
--- a/Packages/ohif-study-list/client/lib/studylist.js
+++ b/Packages/ohif-study-list/client/lib/studylist.js
@@ -1,8 +1,12 @@
 import { Viewerbase } from 'meteor/ohif:viewerbase';
+import { OHIFStudyMetadataSource } from './OHIFStudyMetadataSource';
 
 StudyList = {
     functions: {},
-    callbacks: {}
+    callbacks: {},
+    classes: {
+        OHIFStudyMetadataSource
+    }
 };
 
 StudyList.callbacks.dblClickOnStudy = dblClickOnStudy;
diff --git a/Packages/ohif-study-list/package.js b/Packages/ohif-study-list/package.js
index 1ec26f1f4..a854f9dae 100644
--- a/Packages/ohif-study-list/package.js
+++ b/Packages/ohif-study-list/package.js
@@ -65,5 +65,4 @@ Package.onUse(function(api) {
     // Export the Collections
     api.export('StudyListStudies', 'client');
     api.export('StudyListSelectedStudies', 'client');
-    api.export('OHIFStudyMetadataSource', 'client');
 });
diff --git a/Packages/ohif-viewerbase/client/components/viewer/viewerMain/viewerMain.js b/Packages/ohif-viewerbase/client/components/viewer/viewerMain/viewerMain.js
index a6486d815..cb9a7303a 100644
--- a/Packages/ohif-viewerbase/client/components/viewer/viewerMain/viewerMain.js
+++ b/Packages/ohif-viewerbase/client/components/viewer/viewerMain/viewerMain.js
@@ -114,10 +114,7 @@ Template.viewerMain.onRendered(() => {
     // Enable hotkeys
     hotkeyUtils.enableHotkeys();
 
-    Session.set('OHIFViewerMainRendered', {
-        instance,
-        date: new Date()
-    });
+    Session.set('OHIFViewerMainRendered', {});
 
 });