diff --git a/Packages/ohif-measurements/client/conformance/criteria/MaxTargets.js b/Packages/ohif-measurements/client/conformance/criteria/MaxTargets.js
index 0fda1c40a..42617f297 100644
--- a/Packages/ohif-measurements/client/conformance/criteria/MaxTargets.js
+++ b/Packages/ohif-measurements/client/conformance/criteria/MaxTargets.js
@@ -12,6 +12,11 @@ export const MaxTargetsSchema = {
     required: ['limit']
 };
 
+/* MaxTargetsCriterion
+ *   Check if the number of target measurements exceeded the limit allowed
+ * Options
+ *   limit: Max targets allowed in study
+ */
 export class MaxTargetsCriterion extends BaseCriterion {
 
     constructor(options) {
diff --git a/Packages/ohif-measurements/client/conformance/criteria/MeasurementsLength.js b/Packages/ohif-measurements/client/conformance/criteria/MeasurementsLength.js
index ed6a9ca6a..170aa1d37 100644
--- a/Packages/ohif-measurements/client/conformance/criteria/MeasurementsLength.js
+++ b/Packages/ohif-measurements/client/conformance/criteria/MeasurementsLength.js
@@ -59,7 +59,8 @@ export const MeasurementsLengthSchema = {
             uniqueItems: true
         },
         message: {
-            label: 'Message to be displayed in case of nonconformity'
+            label: 'Message to be displayed in case of nonconformity',
+            type: 'string'
         }
     },
     oneOf: [
@@ -70,6 +71,21 @@ export const MeasurementsLengthSchema = {
     ]
 };
 
+/*
+ * MeasurementsLengthCriterion
+ *   Check the measurements of all bidirectional tools based on 
+ *   short axis, long axis, modalities, location and slice thickness
+ * Options:
+ *   longAxis: Minimum length of long axis
+ *   shortAxis: Minimum length of short axis
+ *   longAxisSliceThicknessMultiplier: Length of long axis multiplier
+ *   shortAxisSliceThicknessMultiplier: Length of short axis multiplier
+ *   modalityIn: Filter to evaluate only measurements with the specified modalities
+ *   modalityNotIn: Filter to evaluate only measurements without the specified modalities
+ *   locationIn: Filter to evaluate only measurements with the specified locations
+ *   locationNotIn: Filter to evaluate only measurements without the specified locations
+ *   message: Message to be displayed in case of nonconformity
+ */
 export class MeasurementsLengthCriterion extends BaseCriterion {
 
     constructor(options) {
diff --git a/Packages/ohif-measurements/client/conformance/criteria/Modality.js b/Packages/ohif-measurements/client/conformance/criteria/Modality.js
index ef1094c73..0eb667dcd 100644
--- a/Packages/ohif-measurements/client/conformance/criteria/Modality.js
+++ b/Packages/ohif-measurements/client/conformance/criteria/Modality.js
@@ -31,7 +31,7 @@ export const ModalitySchema = {
 
 /*
  * ModalityCriteria
- * Check if a modality is allowed or restricted
+ *   Check if a modality is allowed or restricted
  * Options:
  *   method (string): Specify if it\'s goinig to "allow" or "restrict" the modalities
  *   measurementTypes (string[]): List of measurement types that will be evaluated
diff --git a/Packages/ohif-measurements/client/conformance/criteria/NonTargetResponse.js b/Packages/ohif-measurements/client/conformance/criteria/NonTargetResponse.js
index 81605291e..29378de90 100644
--- a/Packages/ohif-measurements/client/conformance/criteria/NonTargetResponse.js
+++ b/Packages/ohif-measurements/client/conformance/criteria/NonTargetResponse.js
@@ -3,6 +3,9 @@ import { BaseCriterion } from './BaseCriterion';
 export const NonTargetResponseSchema = {
 };
 
+/* NonTargetResponseCriterion
+ *   Check if the there are non-target measurements with response different than "present" on baseline
+ */
 export class NonTargetResponseCriterion extends BaseCriterion {
 
     constructor(options) {
diff --git a/Packages/ohif-measurements/client/conformance/criteria/TargetType.js b/Packages/ohif-measurements/client/conformance/criteria/TargetType.js
index e3648c2bb..40f227572 100644
--- a/Packages/ohif-measurements/client/conformance/criteria/TargetType.js
+++ b/Packages/ohif-measurements/client/conformance/criteria/TargetType.js
@@ -3,6 +3,9 @@ import { BaseCriterion } from './BaseCriterion';
 export const TargetTypeSchema = {
 };
 
+/* TargetTypeCriterion
+ *   Check if the there are non-bidirectional target measurements on baseline
+ */
 export class TargetTypeCriterion extends BaseCriterion {
 
     constructor(options) {