diff --git a/Packages/ohif-measurements/client/conformance/ConformanceCriteria.js b/Packages/ohif-measurements/client/conformance/ConformanceCriteria.js
index 93c7c918e..8100fdedb 100644
--- a/Packages/ohif-measurements/client/conformance/ConformanceCriteria.js
+++ b/Packages/ohif-measurements/client/conformance/ConformanceCriteria.js
@@ -2,6 +2,7 @@ import { ReactiveVar } from 'meteor/reactive-var';
 import { Tracker } from 'meteor/tracker';
 import { _ } from 'meteor/underscore';
 import { OHIF } from 'meteor/ohif:core';
+import 'meteor/ohif:viewerbase';
 import { CriteriaEvaluator } from './CriteriaEvaluator';
 import * as evaluations from './evaluations';
 
@@ -153,7 +154,7 @@ class ConformanceCriteria {
     }
 
     getImageMetadata(studyInstanceUid, imageId) {
-        const study = ViewerStudies.findOne({ studyInstanceUid });
+        const study = OHIF.viewer.Studies.findBy({ studyInstanceUid });
 
         // Stop here if the study was not found
         if (!study) {
@@ -169,7 +170,7 @@ class ConformanceCriteria {
             _.each(displaySet.images, image => {
                 if (foundImage) {
                     return;
-                } else if (getImageId(image) === imageId) {
+                } else if (OHIF.viewerbase.getImageId(image) === imageId) {
                     foundImage = image;
                 }
             });
diff --git a/Packages/ohif-measurements/client/lib/exportPdf.js b/Packages/ohif-measurements/client/lib/exportPdf.js
index 7a09e4210..8b0a78098 100644
--- a/Packages/ohif-measurements/client/lib/exportPdf.js
+++ b/Packages/ohif-measurements/client/lib/exportPdf.js
@@ -4,7 +4,7 @@ import { MeasurementReport } from 'meteor/ohif:measurements/client/reports/measu
 OHIF.measurements.exportPdf = (measurementApi, timepointApi) => {
     const currentTimepoint = timepointApi.current();
     const { timepointId } = currentTimepoint;
-    const study = ViewerStudies.findOne({
+    const study = OHIF.viewer.Studies.findBy({
         studyInstanceUid: currentTimepoint.studyInstanceUids[0]
     });
     const report = new MeasurementReport({