diff --git a/services/ui-src/src/measures/2025/AABAD/validation.ts b/services/ui-src/src/measures/2025/AABAD/validation.ts
index f0be1ad2e..0fe5944e4 100644
--- a/services/ui-src/src/measures/2025/AABAD/validation.ts
+++ b/services/ui-src/src/measures/2025/AABAD/validation.ts
@@ -9,7 +9,10 @@ const AABADValidation = (data: FormData) => {
   const ageGroups = PMD.qualifiers;
   const age65PlusIndex = 1;
   const DefinitionOfDenominator = data[DC.DEFINITION_OF_DENOMINATOR];
-  const performanceMeasureArray = GV.getPerfMeasureRateArray(data, PMD.data);
+  const performanceMeasureArray = GV.getPerfMeasureRateArray(
+    data,
+    PMD.data.performanceMeasure
+  );
   let errorArray: any[] = [];
   const whyNotReporting = data[DC.WHY_ARE_YOU_NOT_REPORTING];
   const OPM = data[DC.OPM_RATES];
diff --git a/services/ui-src/src/measures/2025/AABCH/validation.ts b/services/ui-src/src/measures/2025/AABCH/validation.ts
index 015fa2ba7..25e100adc 100644
--- a/services/ui-src/src/measures/2025/AABCH/validation.ts
+++ b/services/ui-src/src/measures/2025/AABCH/validation.ts
@@ -8,7 +8,10 @@ import { DefaultFormData as FormData } from "shared/types/FormData";
 const AABCHValidation = (data: FormData) => {
   const ageGroups = PMD.qualifiers;
   const OPM = data[DC.OPM_RATES];
-  const performanceMeasureArray = GV.getPerfMeasureRateArray(data, PMD.data);
+  const performanceMeasureArray = GV.getPerfMeasureRateArray(
+    data,
+    PMD.data.performanceMeasure
+  );
   const dateRange = data[DC.DATE_RANGE];
   const whyNotReporting = data[DC.WHY_ARE_YOU_NOT_REPORTING];
   const deviationReason = data[DC.DEVIATION_REASON];
diff --git a/services/ui-src/src/measures/2025/ADDCH/validation.ts b/services/ui-src/src/measures/2025/ADDCH/validation.ts
index 7c6ac33f9..25b6356de 100644
--- a/services/ui-src/src/measures/2025/ADDCH/validation.ts
+++ b/services/ui-src/src/measures/2025/ADDCH/validation.ts
@@ -8,7 +8,10 @@ import { DefaultFormData as FormData } from "shared/types/FormData";
 
 const ADDCHValidation = (data: FormData) => {
   const ageGroups = PMD.qualifiers;
-  const performanceMeasureArray = getPerfMeasureRateArray(data, PMD.data);
+  const performanceMeasureArray = getPerfMeasureRateArray(
+    data,
+    PMD.data.performanceMeasure
+  );
   let errorArray: any[] = [];
   const whyNotReporting = data[DC.WHY_ARE_YOU_NOT_REPORTING];
   const OPM = data[DC.OPM_RATES];
diff --git a/services/ui-src/src/measures/2025/AMMAD/validation.ts b/services/ui-src/src/measures/2025/AMMAD/validation.ts
index 0ac9748b4..c582d6f9b 100644
--- a/services/ui-src/src/measures/2025/AMMAD/validation.ts
+++ b/services/ui-src/src/measures/2025/AMMAD/validation.ts
@@ -11,7 +11,10 @@ const AMMADValidation = (data: FormData) => {
   const whyNotReporting = data[DC.WHY_ARE_YOU_NOT_REPORTING];
   const deviationReason = data[DC.DEVIATION_REASON];
   const OPM = data[DC.OPM_RATES];
-  const performanceMeasureArray = GV.getPerfMeasureRateArray(data, PMD.data);
+  const performanceMeasureArray = GV.getPerfMeasureRateArray(
+    data,
+    PMD.data.performanceMeasure
+  );
   const dateRange = data[DC.DATE_RANGE];
   const DefinitionOfDenominator = data[DC.DEFINITION_OF_DENOMINATOR];
 
diff --git a/services/ui-src/src/measures/2025/AMRCH/validation.ts b/services/ui-src/src/measures/2025/AMRCH/validation.ts
index 5f678c5da..c08afc79e 100644
--- a/services/ui-src/src/measures/2025/AMRCH/validation.ts
+++ b/services/ui-src/src/measures/2025/AMRCH/validation.ts
@@ -8,7 +8,10 @@ import { DefaultFormData as FormData } from "shared/types/FormData";
 const AMRCHValidation = (data: FormData) => {
   const ageGroups = PMD.qualifiers;
   const OPM = data[DC.OPM_RATES];
-  const performanceMeasureArray = GV.getPerfMeasureRateArray(data, PMD.data);
+  const performanceMeasureArray = GV.getPerfMeasureRateArray(
+    data,
+    PMD.data.performanceMeasure
+  );
   const dateRange = data[DC.DATE_RANGE];
   const whyNotReporting = data[DC.WHY_ARE_YOU_NOT_REPORTING];
   const didCalculationsDeviate = data[DC.DID_CALCS_DEVIATE] === DC.YES;
diff --git a/services/ui-src/src/measures/2025/APMCH/validation.ts b/services/ui-src/src/measures/2025/APMCH/validation.ts
index ee62282e3..486e3d720 100644
--- a/services/ui-src/src/measures/2025/APMCH/validation.ts
+++ b/services/ui-src/src/measures/2025/APMCH/validation.ts
@@ -10,7 +10,10 @@ const APMCHValidation = (data: FormData) => {
   const didCalculationsDeviate = data[DC.DID_CALCS_DEVIATE] === DC.YES;
   const deviationReason = data[DC.DEVIATION_REASON];
   const OPM = data[DC.OPM_RATES];
-  const performanceMeasureArray = GV.getPerfMeasureRateArray(data, PMD.data);
+  const performanceMeasureArray = GV.getPerfMeasureRateArray(
+    data,
+    PMD.data.performanceMeasure
+  );
   const whyNotReporting = data[DC.WHY_ARE_YOU_NOT_REPORTING];
 
   let errorArray: any[] = [];
diff --git a/services/ui-src/src/measures/2025/APPCH/validation.ts b/services/ui-src/src/measures/2025/APPCH/validation.ts
index 44088a2c5..6992fcd1a 100644
--- a/services/ui-src/src/measures/2025/APPCH/validation.ts
+++ b/services/ui-src/src/measures/2025/APPCH/validation.ts
@@ -9,7 +9,10 @@ const APPCHValidation = (data: FormData) => {
   const whyNotReporting = data[DC.WHY_ARE_YOU_NOT_REPORTING];
   const OPM = data[DC.OPM_RATES];
   const dateRange = data[DC.DATE_RANGE];
-  const performanceMeasureArray = GV.getPerfMeasureRateArray(data, PMD.data);
+  const performanceMeasureArray = GV.getPerfMeasureRateArray(
+    data,
+    PMD.data.performanceMeasure
+  );
   const didCalculationsDeviate = data[DC.DID_CALCS_DEVIATE] === DC.YES;
   const deviationReason = data[DC.DEVIATION_REASON];
 
diff --git a/services/ui-src/src/measures/2025/BCSAD/validation.ts b/services/ui-src/src/measures/2025/BCSAD/validation.ts
index 558f55a39..202d0bc8f 100644
--- a/services/ui-src/src/measures/2025/BCSAD/validation.ts
+++ b/services/ui-src/src/measures/2025/BCSAD/validation.ts
@@ -10,7 +10,10 @@ const BCSValidation = (data: FormData) => {
   const age65PlusIndex = 1;
   const whyNotReporting = data[DC.WHY_ARE_YOU_NOT_REPORTING];
   const OPM = data[DC.OPM_RATES];
-  const performanceMeasureArray = GV.getPerfMeasureRateArray(data, PMD.data);
+  const performanceMeasureArray = GV.getPerfMeasureRateArray(
+    data,
+    PMD.data.performanceMeasure
+  );
   const dateRange = data[DC.DATE_RANGE];
   const DefinitionOfDenominator = data[DC.DEFINITION_OF_DENOMINATOR];
   const didCalculationsDeviate = data[DC.DID_CALCS_DEVIATE] === DC.YES;
diff --git a/services/ui-src/src/measures/2025/CBPAD/validation.ts b/services/ui-src/src/measures/2025/CBPAD/validation.ts
index 1f6a012c7..ee288abe8 100644
--- a/services/ui-src/src/measures/2025/CBPAD/validation.ts
+++ b/services/ui-src/src/measures/2025/CBPAD/validation.ts
@@ -12,7 +12,10 @@ const CBPValidation = (data: FormData) => {
   const didCalculationsDeviate = data[DC.DID_CALCS_DEVIATE] === DC.YES;
   const deviationReason = data[DC.DEVIATION_REASON];
   const OPM = data[DC.OPM_RATES];
-  const performanceMeasureArray = GV.getPerfMeasureRateArray(data, PMD.data);
+  const performanceMeasureArray = GV.getPerfMeasureRateArray(
+    data,
+    PMD.data.performanceMeasure
+  );
   const dateRange = data[DC.DATE_RANGE];
   const DefinitionOfDenominator = data[DC.DEFINITION_OF_DENOMINATOR];
 
diff --git a/services/ui-src/src/measures/2025/CBPHH/validation.ts b/services/ui-src/src/measures/2025/CBPHH/validation.ts
index 3cb91fc50..9048f7d56 100644
--- a/services/ui-src/src/measures/2025/CBPHH/validation.ts
+++ b/services/ui-src/src/measures/2025/CBPHH/validation.ts
@@ -10,7 +10,10 @@ const CBPValidation = (data: FormData) => {
   const age65PlusIndex = 1;
   const whyNotReporting = data[DC.WHY_ARE_YOU_NOT_REPORTING];
   const OPM = data[DC.OPM_RATES];
-  const performanceMeasureArray = GV.getPerfMeasureRateArray(data, PMD.data);
+  const performanceMeasureArray = GV.getPerfMeasureRateArray(
+    data,
+    PMD.data.performanceMeasure
+  );
   const dateRange = data[DC.DATE_RANGE];
   const DefinitionOfDenominator = data[DC.DEFINITION_OF_DENOMINATOR];
   const deviationReason = data[DC.DEVIATION_REASON];
diff --git a/services/ui-src/src/measures/2025/CCPAD/validation.ts b/services/ui-src/src/measures/2025/CCPAD/validation.ts
index a58694f29..5a8a9971d 100644
--- a/services/ui-src/src/measures/2025/CCPAD/validation.ts
+++ b/services/ui-src/src/measures/2025/CCPAD/validation.ts
@@ -11,7 +11,10 @@ const CCPADValidation = (data: FormData) => {
   const didCalculationsDeviate = data[DC.DID_CALCS_DEVIATE] === DC.YES;
   const deviationReason = data[DC.DEVIATION_REASON];
   const OPM = data[DC.OPM_RATES];
-  const performanceMeasureArray = GV.getPerfMeasureRateArray(data, PMD.data);
+  const performanceMeasureArray = GV.getPerfMeasureRateArray(
+    data,
+    PMD.data.performanceMeasure
+  );
   const whyNotReporting = data[DC.WHY_ARE_YOU_NOT_REPORTING];
 
   let errorArray: any[] = [];
@@ -32,7 +35,12 @@ const CCPADValidation = (data: FormData) => {
     ...GV.validateBothDatesCompleted(dateRange),
     ...GV.validateYearFormat(dateRange),
     ...GV.validateOPMRates(OPM),
-    ...GV.validateOneQualRateHigherThanOtherQualPM(data, PMD.data, 1, 0),
+    ...GV.validateOneQualRateHigherThanOtherQualPM(
+      data,
+      PMD.data.performanceMeasure,
+      1,
+      0
+    ),
     ...GV.validateEqualCategoryDenominatorsPM(data, PMD.categories),
     ...GV.validateAtLeastOneDataSource(data),
     ...GV.validateAtLeastOneDataSourceType(data),
@@ -47,7 +55,10 @@ const CCPADValidation = (data: FormData) => {
       OPM,
       ageGroups
     ),
-    ...GV.validateOneCatRateHigherThanOtherCatPM(data, PMD.data),
+    ...GV.validateOneCatRateHigherThanOtherCatPM(
+      data,
+      PMD.data.performanceMeasure
+    ),
     ...GV.validateAtLeastOneDeliverySystem(data),
     ...GV.validateFfsRadioButtonCompletion(data),
     ...GV.validateAtLeastOneDefinitionOfPopulation(data),
diff --git a/services/ui-src/src/measures/2025/CCPCH/validation.ts b/services/ui-src/src/measures/2025/CCPCH/validation.ts
index 1ddd95b81..d0ac2f019 100644
--- a/services/ui-src/src/measures/2025/CCPCH/validation.ts
+++ b/services/ui-src/src/measures/2025/CCPCH/validation.ts
@@ -11,7 +11,10 @@ const CCPCHValidation = (data: FormData) => {
   const didCalculationsDeviate = data[DC.DID_CALCS_DEVIATE] === DC.YES;
   const deviationReason = data[DC.DEVIATION_REASON];
   const OPM = data[DC.OPM_RATES];
-  const performanceMeasureArray = GV.getPerfMeasureRateArray(data, PMD.data);
+  const performanceMeasureArray = GV.getPerfMeasureRateArray(
+    data,
+    PMD.data.performanceMeasure
+  );
   const whyNotReporting = data[DC.WHY_ARE_YOU_NOT_REPORTING];
 
   let errorArray: any[] = [];
@@ -48,8 +51,16 @@ const CCPCHValidation = (data: FormData) => {
       OPM,
       ageGroups
     ),
-    ...GV.validateOneCatRateHigherThanOtherCatPM(data, PMD.data),
-    ...GV.validateOneQualRateHigherThanOtherQualPM(data, PMD.data, 1, 0),
+    ...GV.validateOneCatRateHigherThanOtherCatPM(
+      data,
+      PMD.data.performanceMeasure
+    ),
+    ...GV.validateOneQualRateHigherThanOtherQualPM(
+      data,
+      PMD.data.performanceMeasure,
+      1,
+      0
+    ),
     ...GV.validateAtLeastOneDefinitionOfPopulation(data),
 
     // OMS Specific Validations
diff --git a/services/ui-src/src/measures/2025/CCSAD/validation.ts b/services/ui-src/src/measures/2025/CCSAD/validation.ts
index c529ffdd0..a71aaac99 100644
--- a/services/ui-src/src/measures/2025/CCSAD/validation.ts
+++ b/services/ui-src/src/measures/2025/CCSAD/validation.ts
@@ -10,7 +10,7 @@ const CCSADValidation = (data: FormData) => {
   const whyNotReporting = data[DC.WHY_ARE_YOU_NOT_REPORTING];
   const OPM = data[DC.OPM_RATES];
   const performanceMeasureArray =
-    GV.getPerfMeasureRateArray(data, PMD.data) ?? [];
+    GV.getPerfMeasureRateArray(data, PMD.data.performanceMeasure) ?? [];
   const dateRange = data[DC.DATE_RANGE];
   const didCalculationsDeviate = data[DC.DID_CALCS_DEVIATE] === DC.YES;
   const deviationReason = data[DC.DEVIATION_REASON];
diff --git a/services/ui-src/src/measures/2025/CCWAD/validation.ts b/services/ui-src/src/measures/2025/CCWAD/validation.ts
index 04378051e..2bbb9bd94 100644
--- a/services/ui-src/src/measures/2025/CCWAD/validation.ts
+++ b/services/ui-src/src/measures/2025/CCWAD/validation.ts
@@ -9,7 +9,10 @@ const CCWADValidation = (data: FormData) => {
   const ageGroups = PMD.qualifiers;
   const whyNotReporting = data[DC.WHY_ARE_YOU_NOT_REPORTING];
   const OPM = data[DC.OPM_RATES];
-  const performanceMeasureArray = GV.getPerfMeasureRateArray(data, PMD.data);
+  const performanceMeasureArray = GV.getPerfMeasureRateArray(
+    data,
+    PMD.data.performanceMeasure
+  );
   const dateRange = data[DC.DATE_RANGE];
   const didCalculationsDeviate = data[DC.DID_CALCS_DEVIATE] === DC.YES;
   const deviationReason = data[DC.DEVIATION_REASON];
diff --git a/services/ui-src/src/measures/2025/CCWCH/validation.ts b/services/ui-src/src/measures/2025/CCWCH/validation.ts
index 85aef2d20..082a6f9f8 100644
--- a/services/ui-src/src/measures/2025/CCWCH/validation.ts
+++ b/services/ui-src/src/measures/2025/CCWCH/validation.ts
@@ -9,7 +9,10 @@ const CCWCHValidation = (data: FormData) => {
   const ageGroups = PMD.qualifiers;
   const whyNotReporting = data[DC.WHY_ARE_YOU_NOT_REPORTING];
   const OPM = data[DC.OPM_RATES];
-  const performanceMeasureArray = GV.getPerfMeasureRateArray(data, PMD.data);
+  const performanceMeasureArray = GV.getPerfMeasureRateArray(
+    data,
+    PMD.data.performanceMeasure
+  );
   const dateRange = data[DC.DATE_RANGE];
   const didCalculationsDeviate = data[DC.DID_CALCS_DEVIATE] === DC.YES;
   const deviationReason = data[DC.DEVIATION_REASON];
diff --git a/services/ui-src/src/measures/2025/CDFAD/validation.ts b/services/ui-src/src/measures/2025/CDFAD/validation.ts
index fe7212d83..8fafd8229 100644
--- a/services/ui-src/src/measures/2025/CDFAD/validation.ts
+++ b/services/ui-src/src/measures/2025/CDFAD/validation.ts
@@ -10,7 +10,10 @@ const CDFADValidation = (data: FormData) => {
   const age65PlusIndex = 1;
   const whyNotReporting = data[DC.WHY_ARE_YOU_NOT_REPORTING];
   const OPM = data[DC.OPM_RATES];
-  const performanceMeasureArray = GV.getPerfMeasureRateArray(data, PMD.data);
+  const performanceMeasureArray = GV.getPerfMeasureRateArray(
+    data,
+    PMD.data.performanceMeasure
+  );
   const dateRange = data[DC.DATE_RANGE];
   const DefinitionOfDenominator = data[DC.DEFINITION_OF_DENOMINATOR];
   const deviationReason = data[DC.DEVIATION_REASON];
diff --git a/services/ui-src/src/measures/2025/CDFCH/validation.ts b/services/ui-src/src/measures/2025/CDFCH/validation.ts
index 5d8e01bb9..3414fec62 100644
--- a/services/ui-src/src/measures/2025/CDFCH/validation.ts
+++ b/services/ui-src/src/measures/2025/CDFCH/validation.ts
@@ -10,7 +10,10 @@ const CDFCHValidation = (data: FormData) => {
   const age65PlusIndex = 1;
   const whyNotReporting = data[DC.WHY_ARE_YOU_NOT_REPORTING];
   const OPM = data[DC.OPM_RATES];
-  const performanceMeasureArray = GV.getPerfMeasureRateArray(data, PMD.data);
+  const performanceMeasureArray = GV.getPerfMeasureRateArray(
+    data,
+    PMD.data.performanceMeasure
+  );
   const dateRange = data[DC.DATE_RANGE];
   const DefinitionOfDenominator = data[DC.DEFINITION_OF_DENOMINATOR];
   const deviationReason = data[DC.DEVIATION_REASON];
diff --git a/services/ui-src/src/measures/2025/CDFHH/validation.ts b/services/ui-src/src/measures/2025/CDFHH/validation.ts
index 1983eab0d..16bb93c31 100644
--- a/services/ui-src/src/measures/2025/CDFHH/validation.ts
+++ b/services/ui-src/src/measures/2025/CDFHH/validation.ts
@@ -13,7 +13,10 @@ const CDFHHValidation = (data: FormData) => {
   const didCalculationsDeviate = data[DC.DID_CALCS_DEVIATE] === DC.YES;
   const deviationReason = data[DC.DEVIATION_REASON];
   const dateRange = data[DC.DATE_RANGE];
-  const performanceMeasureArray = GV.getPerfMeasureRateArray(data, PMD.data);
+  const performanceMeasureArray = GV.getPerfMeasureRateArray(
+    data,
+    PMD.data.performanceMeasure
+  );
   let errorArray: any[] = [];
 
   if (data[DC.DID_REPORT] === DC.NO) {
diff --git a/services/ui-src/src/measures/2025/CHLAD/validation.ts b/services/ui-src/src/measures/2025/CHLAD/validation.ts
index 485072b63..8615f61c5 100644
--- a/services/ui-src/src/measures/2025/CHLAD/validation.ts
+++ b/services/ui-src/src/measures/2025/CHLAD/validation.ts
@@ -9,7 +9,10 @@ const CHLValidation = (data: FormData) => {
   const ageGroups = PMD.qualifiers;
   const whyNotReporting = data[DC.WHY_ARE_YOU_NOT_REPORTING];
   const OPM = data[DC.OPM_RATES];
-  const performanceMeasureArray = GV.getPerfMeasureRateArray(data, PMD.data);
+  const performanceMeasureArray = GV.getPerfMeasureRateArray(
+    data,
+    PMD.data.performanceMeasure
+  );
   const dateRange = data[DC.DATE_RANGE];
   const didCalculationsDeviate = data[DC.DID_CALCS_DEVIATE] === DC.YES;
   const deviationReason = data[DC.DEVIATION_REASON];
diff --git a/services/ui-src/src/measures/2025/CHLCH/validation.ts b/services/ui-src/src/measures/2025/CHLCH/validation.ts
index bd090fd34..1600aea21 100644
--- a/services/ui-src/src/measures/2025/CHLCH/validation.ts
+++ b/services/ui-src/src/measures/2025/CHLCH/validation.ts
@@ -9,7 +9,10 @@ const CHLValidation = (data: FormData) => {
   const ageGroups = PMD.qualifiers;
   const whyNotReporting = data[DC.WHY_ARE_YOU_NOT_REPORTING];
   const OPM = data[DC.OPM_RATES];
-  const performanceMeasureArray = GV.getPerfMeasureRateArray(data, PMD.data);
+  const performanceMeasureArray = GV.getPerfMeasureRateArray(
+    data,
+    PMD.data.performanceMeasure
+  );
   const dateRange = data[DC.DATE_RANGE];
   const didCalculationsDeviate = data[DC.DID_CALCS_DEVIATE] === DC.YES;
   const deviationReason = data[DC.DEVIATION_REASON];
diff --git a/services/ui-src/src/measures/2025/CISCH/validation.ts b/services/ui-src/src/measures/2025/CISCH/validation.ts
index 2d4d5b7b9..c8879d51b 100644
--- a/services/ui-src/src/measures/2025/CISCH/validation.ts
+++ b/services/ui-src/src/measures/2025/CISCH/validation.ts
@@ -10,7 +10,7 @@ const CISCHValidation = (data: FormData) => {
   const whyNotReporting = data[DC.WHY_ARE_YOU_NOT_REPORTING];
   const OPM = data[DC.OPM_RATES];
   const performanceMeasureArray =
-    GV.getPerfMeasureRateArray(data, PMD.data) ?? [];
+    GV.getPerfMeasureRateArray(data, PMD.data.performanceMeasure) ?? [];
   const dateRange = data[DC.DATE_RANGE];
   const didCalculationsDeviate = data[DC.DID_CALCS_DEVIATE] === DC.YES;
   const deviationReason = data[DC.DEVIATION_REASON];
diff --git a/services/ui-src/src/measures/2025/COBAD/validation.ts b/services/ui-src/src/measures/2025/COBAD/validation.ts
index 037e00f6c..da0cf9fd2 100644
--- a/services/ui-src/src/measures/2025/COBAD/validation.ts
+++ b/services/ui-src/src/measures/2025/COBAD/validation.ts
@@ -10,7 +10,10 @@ const COBADValidation = (data: FormData) => {
   const age65PlusIndex = 1;
   const whyNotReporting = data[DC.WHY_ARE_YOU_NOT_REPORTING];
   const OPM = data[DC.OPM_RATES];
-  const performanceMeasureArray = GV.getPerfMeasureRateArray(data, PMD.data);
+  const performanceMeasureArray = GV.getPerfMeasureRateArray(
+    data,
+    PMD.data.performanceMeasure
+  );
   const dateRange = data[DC.DATE_RANGE];
   const DefinitionOfDenominator = data[DC.DEFINITION_OF_DENOMINATOR];
   const didCalculationsDeviate = data[DC.DID_CALCS_DEVIATE] === DC.YES;
diff --git a/services/ui-src/src/measures/2025/COLAD/validation.ts b/services/ui-src/src/measures/2025/COLAD/validation.ts
index 89dfc89a3..6ac4b70b7 100644
--- a/services/ui-src/src/measures/2025/COLAD/validation.ts
+++ b/services/ui-src/src/measures/2025/COLAD/validation.ts
@@ -10,7 +10,10 @@ const COLADValidation = (data: FormData) => {
   const age65PlusIndex = 2;
   const whyNotReporting = data[DC.WHY_ARE_YOU_NOT_REPORTING];
   const OPM = data[DC.OPM_RATES];
-  const performanceMeasureArray = GV.getPerfMeasureRateArray(data, PMD.data);
+  const performanceMeasureArray = GV.getPerfMeasureRateArray(
+    data,
+    PMD.data.performanceMeasure
+  );
   const dateRange = data[DC.DATE_RANGE];
   const DefinitionOfDenominator = data[DC.DEFINITION_OF_DENOMINATOR];
   const errorReplacementText = "Ages 66 to 75";
diff --git a/services/ui-src/src/measures/2025/COLHH/validation.ts b/services/ui-src/src/measures/2025/COLHH/validation.ts
index 4a12e69ce..1da936b5e 100644
--- a/services/ui-src/src/measures/2025/COLHH/validation.ts
+++ b/services/ui-src/src/measures/2025/COLHH/validation.ts
@@ -10,7 +10,10 @@ const COLHHValidation = (data: FormData) => {
   const age65PlusIndex = 2;
   const whyNotReporting = data[DC.WHY_ARE_YOU_NOT_REPORTING];
   const OPM = data[DC.OPM_RATES];
-  const performanceMeasureArray = GV.getPerfMeasureRateArray(data, PMD.data);
+  const performanceMeasureArray = GV.getPerfMeasureRateArray(
+    data,
+    PMD.data.performanceMeasure
+  );
   const dateRange = data[DC.DATE_RANGE];
   const DefinitionOfDenominator = data[DC.DEFINITION_OF_DENOMINATOR];
   const errorReplacementText = "Ages 66 to 75";
diff --git a/services/ui-src/src/measures/2025/CPUAD/validation.ts b/services/ui-src/src/measures/2025/CPUAD/validation.ts
index 5cfdc341d..2ac1e7779 100644
--- a/services/ui-src/src/measures/2025/CPUAD/validation.ts
+++ b/services/ui-src/src/measures/2025/CPUAD/validation.ts
@@ -8,7 +8,10 @@ import { DefaultFormData as FormData } from "shared/types/FormData";
 const CPUADValidation = (data: FormData) => {
   const carePlans = PMD.qualifiers;
   const whyNotReporting = data[DC.WHY_ARE_YOU_NOT_REPORTING];
-  const performanceMeasureArray = GV.getPerfMeasureRateArray(data, PMD.data);
+  const performanceMeasureArray = GV.getPerfMeasureRateArray(
+    data,
+    PMD.data.performanceMeasure
+  );
 
   let errorArray: any[] = [];
   const OPM = data[DC.OPM_RATES];
diff --git a/services/ui-src/src/measures/2025/DEVCH/validation.ts b/services/ui-src/src/measures/2025/DEVCH/validation.ts
index 1fada4f0f..d7db2a1d8 100644
--- a/services/ui-src/src/measures/2025/DEVCH/validation.ts
+++ b/services/ui-src/src/measures/2025/DEVCH/validation.ts
@@ -9,7 +9,10 @@ const DEVCHValidation = (data: FormData) => {
   const ageGroups = PMD.qualifiers;
   const whyNotReporting = data[DC.WHY_ARE_YOU_NOT_REPORTING];
   const OPM = data[DC.OPM_RATES];
-  const performanceMeasureArray = GV.getPerfMeasureRateArray(data, PMD.data);
+  const performanceMeasureArray = GV.getPerfMeasureRateArray(
+    data,
+    PMD.data.performanceMeasure
+  );
   const dateRange = data[DC.DATE_RANGE];
   const didCalculationsDeviate = data[DC.DID_CALCS_DEVIATE] === DC.YES;
   const deviationReason = data[DC.DEVIATION_REASON];
diff --git a/services/ui-src/src/measures/2025/EDVAD/validation.ts b/services/ui-src/src/measures/2025/EDVAD/validation.ts
index 9dd4d34c2..f40214cbe 100644
--- a/services/ui-src/src/measures/2025/EDVAD/validation.ts
+++ b/services/ui-src/src/measures/2025/EDVAD/validation.ts
@@ -11,7 +11,10 @@ const EDVADValidation = (data: FormData) => {
   const didCalculationsDeviate = data[DC.DID_CALCS_DEVIATE] === DC.YES;
   const deviationReason = data[DC.DEVIATION_REASON];
   const OPM = data[DC.OPM_RATES];
-  const performanceMeasureArray = GV.getPerfMeasureRateArray(data, PMD.data);
+  const performanceMeasureArray = GV.getPerfMeasureRateArray(
+    data,
+    PMD.data.performanceMeasure
+  );
   const whyNotReporting = data[DC.WHY_ARE_YOU_NOT_REPORTING];
 
   let errorArray: any[] = [];
diff --git a/services/ui-src/src/measures/2025/FUAAD/validation.ts b/services/ui-src/src/measures/2025/FUAAD/validation.ts
index afafff727..e2e4285e0 100644
--- a/services/ui-src/src/measures/2025/FUAAD/validation.ts
+++ b/services/ui-src/src/measures/2025/FUAAD/validation.ts
@@ -10,7 +10,10 @@ const FUAADValidation = (data: FormData) => {
   const sixtyDaysIndex = 1;
   const whyNotReporting = data[DC.WHY_ARE_YOU_NOT_REPORTING];
   const OPM = data[DC.OPM_RATES];
-  const performanceMeasureArray = GV.getPerfMeasureRateArray(data, PMD.data);
+  const performanceMeasureArray = GV.getPerfMeasureRateArray(
+    data,
+    PMD.data.performanceMeasure
+  );
   const dateRange = data[DC.DATE_RANGE];
   const DefinitionOfDenominator = data[DC.DEFINITION_OF_DENOMINATOR];
   const didCalculationsDeviate = data[DC.DID_CALCS_DEVIATE] === DC.YES;
@@ -49,7 +52,10 @@ const FUAADValidation = (data: FormData) => {
     ),
     ...GV.validateRateNotZeroPM(performanceMeasureArray, OPM, ageGroups),
     ...GV.validateRateZeroPM(performanceMeasureArray, OPM, ageGroups, data),
-    ...GV.validateOneCatRateHigherThanOtherCatPM(data, PMD.data),
+    ...GV.validateOneCatRateHigherThanOtherCatPM(
+      data,
+      PMD.data.performanceMeasure
+    ),
     ...GV.validateDateRangeRadioButtonCompletion(data),
     ...GV.validateAtLeastOneDeliverySystem(data),
     ...GV.validateFfsRadioButtonCompletion(data),
diff --git a/services/ui-src/src/measures/2025/FUACH/validation.ts b/services/ui-src/src/measures/2025/FUACH/validation.ts
index 04bae8801..636ef9dde 100644
--- a/services/ui-src/src/measures/2025/FUACH/validation.ts
+++ b/services/ui-src/src/measures/2025/FUACH/validation.ts
@@ -8,7 +8,10 @@ import { DefaultFormData as FormData } from "shared/types/FormData";
 
 const FUACHValidation = (data: FormData) => {
   const ageGroups = PMD.qualifiers;
-  const performanceMeasureArray = getPerfMeasureRateArray(data, PMD.data);
+  const performanceMeasureArray = getPerfMeasureRateArray(
+    data,
+    PMD.data.performanceMeasure
+  );
   const whyNotReporting = data[DC.WHY_ARE_YOU_NOT_REPORTING];
   const OPM = data[DC.OPM_RATES];
   const dateRange = data[DC.DATE_RANGE];
@@ -51,7 +54,10 @@ const FUACHValidation = (data: FormData) => {
       didCalculationsDeviate,
       deviationReason
     ),
-    ...GV.validateOneCatRateHigherThanOtherCatPM(data, PMD.data),
+    ...GV.validateOneCatRateHigherThanOtherCatPM(
+      data,
+      PMD.data.performanceMeasure
+    ),
 
     // OMS Validations
     ...GV.omsValidations({
diff --git a/services/ui-src/src/measures/2025/FUAHH/validation.ts b/services/ui-src/src/measures/2025/FUAHH/validation.ts
index c116cf8ff..8fac085bf 100644
--- a/services/ui-src/src/measures/2025/FUAHH/validation.ts
+++ b/services/ui-src/src/measures/2025/FUAHH/validation.ts
@@ -12,7 +12,10 @@ const FUAHHValidation = (data: FormData) => {
   const didCalculationsDeviate = data[DC.DID_CALCS_DEVIATE] === DC.YES;
   const deviationReason = data[DC.DEVIATION_REASON];
   const OPM = data[DC.OPM_RATES];
-  const performanceMeasureArray = GV.getPerfMeasureRateArray(data, PMD.data);
+  const performanceMeasureArray = GV.getPerfMeasureRateArray(
+    data,
+    PMD.data.performanceMeasure
+  );
   const sixtyDaysIndex = 2;
   const whyNotReporting = data[DC.WHY_ARE_YOU_NOT_REPORTING];
 
@@ -69,7 +72,10 @@ const FUAHHValidation = (data: FormData) => {
     ...GV.validateRateZeroPM(performanceMeasureArray, OPM, ageGroups, data),
     ...GV.validateRateNotZeroPM(performanceMeasureArray, OPM, ageGroups),
     ...GV.validateTotalNDR(performanceMeasureArray),
-    ...GV.validateOneCatRateHigherThanOtherCatPM(data, PMD.data),
+    ...GV.validateOneCatRateHigherThanOtherCatPM(
+      data,
+      PMD.data.performanceMeasure
+    ),
 
     // OMS Validations
     ...GV.omsValidations({
diff --git a/services/ui-src/src/measures/2025/FUHAD/validation.ts b/services/ui-src/src/measures/2025/FUHAD/validation.ts
index ced1151d0..4bf78e2c1 100644
--- a/services/ui-src/src/measures/2025/FUHAD/validation.ts
+++ b/services/ui-src/src/measures/2025/FUHAD/validation.ts
@@ -9,7 +9,10 @@ const FUHValidation = (data: FormData) => {
   const ageGroups = PMD.qualifiers;
   const whyNotReporting = data[DC.WHY_ARE_YOU_NOT_REPORTING];
   const OPM = data[DC.OPM_RATES];
-  const performanceMeasureArray = GV.getPerfMeasureRateArray(data, PMD.data);
+  const performanceMeasureArray = GV.getPerfMeasureRateArray(
+    data,
+    PMD.data.performanceMeasure
+  );
   const dateRange = data[DC.DATE_RANGE];
   const didCalculationsDeviate = data[DC.DID_CALCS_DEVIATE] === DC.YES;
   const deviationReason = data[DC.DEVIATION_REASON];
diff --git a/services/ui-src/src/measures/2025/FUHCH/validation.ts b/services/ui-src/src/measures/2025/FUHCH/validation.ts
index 29ba4ae97..2b5e5a7cf 100644
--- a/services/ui-src/src/measures/2025/FUHCH/validation.ts
+++ b/services/ui-src/src/measures/2025/FUHCH/validation.ts
@@ -9,7 +9,10 @@ const FUHValidation = (data: FormData) => {
   const ageGroups = PMD.qualifiers;
   const whyNotReporting = data[DC.WHY_ARE_YOU_NOT_REPORTING];
   const OPM = data[DC.OPM_RATES];
-  const performanceMeasureArray = GV.getPerfMeasureRateArray(data, PMD.data);
+  const performanceMeasureArray = GV.getPerfMeasureRateArray(
+    data,
+    PMD.data.performanceMeasure
+  );
   const dateRange = data[DC.DATE_RANGE];
   const didCalculationsDeviate = data[DC.DID_CALCS_DEVIATE] === DC.YES;
   const deviationReason = data[DC.DEVIATION_REASON];
diff --git a/services/ui-src/src/measures/2025/FUHHH/validation.ts b/services/ui-src/src/measures/2025/FUHHH/validation.ts
index 9a555fb06..94cc61295 100644
--- a/services/ui-src/src/measures/2025/FUHHH/validation.ts
+++ b/services/ui-src/src/measures/2025/FUHHH/validation.ts
@@ -12,7 +12,10 @@ const FUHHHValidation = (data: FormData) => {
   const didCalculationsDeviate = data[DC.DID_CALCS_DEVIATE] === DC.YES;
   const deviationReason = data[DC.DEVIATION_REASON];
   const OPM = data[DC.OPM_RATES];
-  const performanceMeasureArray = GV.getPerfMeasureRateArray(data, PMD.data);
+  const performanceMeasureArray = GV.getPerfMeasureRateArray(
+    data,
+    PMD.data.performanceMeasure
+  );
   const sixtyDaysIndex = 2;
   const whyNotReporting = data[DC.WHY_ARE_YOU_NOT_REPORTING];
 
@@ -68,7 +71,10 @@ const FUHHHValidation = (data: FormData) => {
     ...GV.validateRateZeroPM(performanceMeasureArray, OPM, ageGroups, data),
     ...GV.validateRateNotZeroPM(performanceMeasureArray, OPM, ageGroups),
     ...GV.validateTotalNDR(performanceMeasureArray),
-    ...GV.validateOneCatRateHigherThanOtherCatPM(data, PMD.data),
+    ...GV.validateOneCatRateHigherThanOtherCatPM(
+      data,
+      PMD.data.performanceMeasure
+    ),
 
     // OMS Validations
     ...GV.omsValidations({
diff --git a/services/ui-src/src/measures/2025/FUMAD/validation.ts b/services/ui-src/src/measures/2025/FUMAD/validation.ts
index df3dfc737..c69cb47b0 100644
--- a/services/ui-src/src/measures/2025/FUMAD/validation.ts
+++ b/services/ui-src/src/measures/2025/FUMAD/validation.ts
@@ -10,7 +10,10 @@ const FUMADValidation = (data: FormData) => {
   const sixtyDaysIndex = 1;
   const whyNotReporting = data[DC.WHY_ARE_YOU_NOT_REPORTING];
   const OPM = data[DC.OPM_RATES];
-  const performanceMeasureArray = GV.getPerfMeasureRateArray(data, PMD.data);
+  const performanceMeasureArray = GV.getPerfMeasureRateArray(
+    data,
+    PMD.data.performanceMeasure
+  );
   const DefinitionOfDenominator = data[DC.DEFINITION_OF_DENOMINATOR];
   const dateRange = data[DC.DATE_RANGE];
   const didCalculationsDeviate = data[DC.DID_CALCS_DEVIATE] === DC.YES;
@@ -63,7 +66,10 @@ const FUMADValidation = (data: FormData) => {
     ...GV.validateHedisYear(data),
     ...GV.validateAtLeastOneDefinitionOfPopulation(data),
     ...GV.validateOPMRates(OPM),
-    ...GV.validateOneCatRateHigherThanOtherCatPM(data, PMD.data),
+    ...GV.validateOneCatRateHigherThanOtherCatPM(
+      data,
+      PMD.data.performanceMeasure
+    ),
     ...GV.validateDeviationTextFieldFilled(
       didCalculationsDeviate,
       deviationReason
diff --git a/services/ui-src/src/measures/2025/FUMCH/validation.ts b/services/ui-src/src/measures/2025/FUMCH/validation.ts
index d7d29b2d1..3341d67cd 100644
--- a/services/ui-src/src/measures/2025/FUMCH/validation.ts
+++ b/services/ui-src/src/measures/2025/FUMCH/validation.ts
@@ -9,7 +9,10 @@ const FUMCHValidation = (data: FormData) => {
   const ageGroups = PMD.qualifiers;
   const whyNotReporting = data[DC.WHY_ARE_YOU_NOT_REPORTING];
   const OPM = data[DC.OPM_RATES];
-  const performanceMeasureArray = GV.getPerfMeasureRateArray(data, PMD.data);
+  const performanceMeasureArray = GV.getPerfMeasureRateArray(
+    data,
+    PMD.data.performanceMeasure
+  );
   const dateRange = data[DC.DATE_RANGE];
   const didCalculationsDeviate = data[DC.DID_CALCS_DEVIATE] === DC.YES;
   const deviationReason = data[DC.DEVIATION_REASON];
diff --git a/services/ui-src/src/measures/2025/FUMHH/validation.ts b/services/ui-src/src/measures/2025/FUMHH/validation.ts
index c132b45ad..bb63ba7ab 100644
--- a/services/ui-src/src/measures/2025/FUMHH/validation.ts
+++ b/services/ui-src/src/measures/2025/FUMHH/validation.ts
@@ -12,7 +12,10 @@ const FUMHHValidation = (data: FormData) => {
   const didCalculationsDeviate = data[DC.DID_CALCS_DEVIATE] === DC.YES;
   const deviationReason = data[DC.DEVIATION_REASON];
   const OPM = data[DC.OPM_RATES];
-  const performanceMeasureArray = GV.getPerfMeasureRateArray(data, PMD.data);
+  const performanceMeasureArray = GV.getPerfMeasureRateArray(
+    data,
+    PMD.data.performanceMeasure
+  );
   const whyNotReporting = data[DC.WHY_ARE_YOU_NOT_REPORTING];
 
   let errorArray: any[] = [];
diff --git a/services/ui-src/src/measures/2025/HBDAD/validation.ts b/services/ui-src/src/measures/2025/HBDAD/validation.ts
index f239c0d94..4c76d2cbc 100644
--- a/services/ui-src/src/measures/2025/HBDAD/validation.ts
+++ b/services/ui-src/src/measures/2025/HBDAD/validation.ts
@@ -11,7 +11,7 @@ const HBDADValidation = (data: FormData) => {
   const whyNotReporting = data[DC.WHY_ARE_YOU_NOT_REPORTING];
   const OPM = data[DC.OPM_RATES];
   const performanceMeasureArray =
-    GV.getPerfMeasureRateArray(data, PMD.data) ?? [];
+    GV.getPerfMeasureRateArray(data, PMD.data.performanceMeasure) ?? [];
   const dateRange = data[DC.DATE_RANGE];
   const didCalculationsDeviate = data[DC.DID_CALCS_DEVIATE] === DC.YES;
   const deviationReason = data[DC.DEVIATION_REASON];
diff --git a/services/ui-src/src/measures/2025/HPCMIAD/validation.ts b/services/ui-src/src/measures/2025/HPCMIAD/validation.ts
index c81a32646..265044a31 100644
--- a/services/ui-src/src/measures/2025/HPCMIAD/validation.ts
+++ b/services/ui-src/src/measures/2025/HPCMIAD/validation.ts
@@ -10,7 +10,10 @@ const HPCMIADValidation = (data: FormData) => {
   const age65PlusIndex = 1;
   const whyNotReporting = data[DC.WHY_ARE_YOU_NOT_REPORTING];
   const OPM = data[DC.OPM_RATES];
-  const performanceMeasureArray = GV.getPerfMeasureRateArray(data, PMD.data);
+  const performanceMeasureArray = GV.getPerfMeasureRateArray(
+    data,
+    PMD.data.performanceMeasure
+  );
   const dateRange = data[DC.DATE_RANGE];
   const DefinitionOfDenominator = data[DC.DEFINITION_OF_DENOMINATOR];
   const didCalculationsDeviate = data[DC.DID_CALCS_DEVIATE] === DC.YES;
diff --git a/services/ui-src/src/measures/2025/HVLAD/validation.ts b/services/ui-src/src/measures/2025/HVLAD/validation.ts
index 228e443c4..7dacf1bcb 100644
--- a/services/ui-src/src/measures/2025/HVLAD/validation.ts
+++ b/services/ui-src/src/measures/2025/HVLAD/validation.ts
@@ -10,7 +10,10 @@ const HVLADValidation = (data: FormData) => {
   const age65PlusIndex = 1;
   const whyNotReporting = data[DC.WHY_ARE_YOU_NOT_REPORTING];
   const OPM = data[DC.OPM_RATES];
-  const performanceMeasureArray = GV.getPerfMeasureRateArray(data, PMD.data);
+  const performanceMeasureArray = GV.getPerfMeasureRateArray(
+    data,
+    PMD.data.performanceMeasure
+  );
   const dateRange = data[DC.DATE_RANGE];
   const DefinitionOfDenominator = data[DC.DEFINITION_OF_DENOMINATOR];
   const didCalculationsDeviate = data[DC.DID_CALCS_DEVIATE] === DC.YES;
diff --git a/services/ui-src/src/measures/2025/IETAD/validation.ts b/services/ui-src/src/measures/2025/IETAD/validation.ts
index 3b0bdd2ff..7f2998b15 100644
--- a/services/ui-src/src/measures/2025/IETAD/validation.ts
+++ b/services/ui-src/src/measures/2025/IETAD/validation.ts
@@ -10,7 +10,10 @@ const IETValidation = (data: FormData) => {
   const age65PlusIndex = 1;
   const whyNotReporting = data[DC.WHY_ARE_YOU_NOT_REPORTING];
   const OPM = data[DC.OPM_RATES];
-  const performanceMeasureArray = GV.getPerfMeasureRateArray(data, PMD.data);
+  const performanceMeasureArray = GV.getPerfMeasureRateArray(
+    data,
+    PMD.data.performanceMeasure
+  );
   const dateRange = data[DC.DATE_RANGE];
   const didCalculationsDeviate = data[DC.DID_CALCS_DEVIATE] === DC.YES;
   const deviationReason = data[DC.DEVIATION_REASON];
@@ -77,7 +80,13 @@ const IETValidation = (data: FormData) => {
     ...filteredSameDenominatorErrors,
     ...GV.validateRateNotZeroPM(performanceMeasureArray, OPM, ageGroups),
     ...GV.validateRateZeroPM(performanceMeasureArray, OPM, ageGroups, data),
-    ...GV.validateOneCatRateHigherThanOtherCatPM(data, PMD.data, 0, 1, 2),
+    ...GV.validateOneCatRateHigherThanOtherCatPM(
+      data,
+      PMD.data.performanceMeasure,
+      0,
+      1,
+      2
+    ),
     ...GV.validateAtLeastOneDefinitionOfPopulation(data),
     ...GV.validateNDRTotalsMatchSum(performanceMeasureArray),
 
diff --git a/services/ui-src/src/measures/2025/IETHH/validation.ts b/services/ui-src/src/measures/2025/IETHH/validation.ts
index cecf50b56..8533a7a2c 100644
--- a/services/ui-src/src/measures/2025/IETHH/validation.ts
+++ b/services/ui-src/src/measures/2025/IETHH/validation.ts
@@ -10,7 +10,10 @@ const IETValidation = (data: FormData) => {
   const age65PlusIndex = 2;
   const whyNotReporting = data[DC.WHY_ARE_YOU_NOT_REPORTING];
   const OPM = data[DC.OPM_RATES];
-  const performanceMeasureArray = GV.getPerfMeasureRateArray(data, PMD.data);
+  const performanceMeasureArray = GV.getPerfMeasureRateArray(
+    data,
+    PMD.data.performanceMeasure
+  );
   const dateRange = data[DC.DATE_RANGE];
   const didCalculationsDeviate = data[DC.DID_CALCS_DEVIATE] === DC.YES;
   const deviationReason = data[DC.DEVIATION_REASON];
@@ -57,7 +60,13 @@ const IETValidation = (data: FormData) => {
 
   errorArray = [
     ...errorArray,
-    ...GV.validateOneCatRateHigherThanOtherCatPM(data, PMD.data, 0, 1, 2),
+    ...GV.validateOneCatRateHigherThanOtherCatPM(
+      data,
+      PMD.data.performanceMeasure,
+      0,
+      1,
+      2
+    ),
     ...GV.validateAtLeastOneRateComplete(
       performanceMeasureArray,
       OPM,
diff --git a/services/ui-src/src/measures/2025/IMACH/validation.ts b/services/ui-src/src/measures/2025/IMACH/validation.ts
index 907131d49..1d93c6df3 100644
--- a/services/ui-src/src/measures/2025/IMACH/validation.ts
+++ b/services/ui-src/src/measures/2025/IMACH/validation.ts
@@ -9,7 +9,10 @@ const DEVCHValidation = (data: FormData) => {
   const ageGroups = PMD.qualifiers;
   const whyNotReporting = data[DC.WHY_ARE_YOU_NOT_REPORTING];
   const OPM = data[DC.OPM_RATES];
-  const performanceMeasureArray = GV.getPerfMeasureRateArray(data, PMD.data);
+  const performanceMeasureArray = GV.getPerfMeasureRateArray(
+    data,
+    PMD.data.performanceMeasure
+  );
   const dateRange = data[DC.DATE_RANGE];
   const didCalculationsDeviate = data[DC.DID_CALCS_DEVIATE] === DC.YES;
   const deviationReason = data[DC.DEVIATION_REASON];
diff --git a/services/ui-src/src/measures/2025/LSCCH/validation.ts b/services/ui-src/src/measures/2025/LSCCH/validation.ts
index cb2ac4f3b..9bab11d37 100644
--- a/services/ui-src/src/measures/2025/LSCCH/validation.ts
+++ b/services/ui-src/src/measures/2025/LSCCH/validation.ts
@@ -11,7 +11,10 @@ const LSCCHValidation = (data: FormData) => {
   const didCalculationsDeviate = data[DC.DID_CALCS_DEVIATE] === DC.YES;
   const deviationReason = data[DC.DEVIATION_REASON];
   const OPM = data[DC.OPM_RATES];
-  const performanceMeasureArray = GV.getPerfMeasureRateArray(data, PMD.data);
+  const performanceMeasureArray = GV.getPerfMeasureRateArray(
+    data,
+    PMD.data.performanceMeasure
+  );
   const whyNotReporting = data[DC.WHY_ARE_YOU_NOT_REPORTING];
 
   let errorArray: any[] = [];
diff --git a/services/ui-src/src/measures/2025/OEVCH/validation.ts b/services/ui-src/src/measures/2025/OEVCH/validation.ts
index dc31a3b48..3e45395af 100644
--- a/services/ui-src/src/measures/2025/OEVCH/validation.ts
+++ b/services/ui-src/src/measures/2025/OEVCH/validation.ts
@@ -11,7 +11,10 @@ const OEVCHValidation = (data: FormData) => {
   const didCalculationsDeviate = data[DC.DID_CALCS_DEVIATE] === DC.YES;
   const deviationReason = data[DC.DEVIATION_REASON];
   const OPM = data[DC.OPM_RATES];
-  const performanceMeasureArray = GV.getPerfMeasureRateArray(data, PMD.data);
+  const performanceMeasureArray = GV.getPerfMeasureRateArray(
+    data,
+    PMD.data.performanceMeasure
+  );
   const whyNotReporting = data[DC.WHY_ARE_YOU_NOT_REPORTING];
 
   let errorArray: any[] = [];
diff --git a/services/ui-src/src/measures/2025/OEVPAD/validation.ts b/services/ui-src/src/measures/2025/OEVPAD/validation.ts
index cb6541336..82b00d530 100644
--- a/services/ui-src/src/measures/2025/OEVPAD/validation.ts
+++ b/services/ui-src/src/measures/2025/OEVPAD/validation.ts
@@ -11,7 +11,10 @@ const OEVPADValidation = (data: FormData) => {
   const didCalculationsDeviate = data[DC.DID_CALCS_DEVIATE] === DC.YES;
   const deviationReason = data[DC.DEVIATION_REASON];
   const OPM = data[DC.OPM_RATES];
-  const performanceMeasureArray = GV.getPerfMeasureRateArray(data, PMD.data);
+  const performanceMeasureArray = GV.getPerfMeasureRateArray(
+    data,
+    PMD.data.performanceMeasure
+  );
   const whyNotReporting = data[DC.WHY_ARE_YOU_NOT_REPORTING];
 
   let errorArray: any[] = [];
diff --git a/services/ui-src/src/measures/2025/OEVPCH/validation.ts b/services/ui-src/src/measures/2025/OEVPCH/validation.ts
index 2dec1f969..6e5ea39e4 100644
--- a/services/ui-src/src/measures/2025/OEVPCH/validation.ts
+++ b/services/ui-src/src/measures/2025/OEVPCH/validation.ts
@@ -11,7 +11,10 @@ const OEVPCHValidation = (data: FormData) => {
   const didCalculationsDeviate = data[DC.DID_CALCS_DEVIATE] === DC.YES;
   const deviationReason = data[DC.DEVIATION_REASON];
   const OPM = data[DC.OPM_RATES];
-  const performanceMeasureArray = GV.getPerfMeasureRateArray(data, PMD.data);
+  const performanceMeasureArray = GV.getPerfMeasureRateArray(
+    data,
+    PMD.data.performanceMeasure
+  );
   const whyNotReporting = data[DC.WHY_ARE_YOU_NOT_REPORTING];
 
   let errorArray: any[] = [];
diff --git a/services/ui-src/src/measures/2025/OHDAD/validation.ts b/services/ui-src/src/measures/2025/OHDAD/validation.ts
index da4f5336a..061369ee7 100644
--- a/services/ui-src/src/measures/2025/OHDAD/validation.ts
+++ b/services/ui-src/src/measures/2025/OHDAD/validation.ts
@@ -10,7 +10,10 @@ const OHDValidation = (data: FormData) => {
   const age65PlusIndex = 1;
   const whyNotReporting = data[DC.WHY_ARE_YOU_NOT_REPORTING];
   const OPM = data[DC.OPM_RATES];
-  const performanceMeasureArray = GV.getPerfMeasureRateArray(data, PMD.data);
+  const performanceMeasureArray = GV.getPerfMeasureRateArray(
+    data,
+    PMD.data.performanceMeasure
+  );
   const dateRange = data[DC.DATE_RANGE];
   const DefinitionOfDenominator = data[DC.DEFINITION_OF_DENOMINATOR];
   const didCalculationsDeviate = data[DC.DID_CALCS_DEVIATE] === DC.YES;
diff --git a/services/ui-src/src/measures/2025/OUDAD/validation.ts b/services/ui-src/src/measures/2025/OUDAD/validation.ts
index 7b1cb2c71..6c939a0e2 100644
--- a/services/ui-src/src/measures/2025/OUDAD/validation.ts
+++ b/services/ui-src/src/measures/2025/OUDAD/validation.ts
@@ -9,7 +9,7 @@ const OUDValidation = (data: FormData) => {
   const OPM = data[DC.OPM_RATES];
   const ageGroups = PMD.qualifiers;
   const performanceMeasureArray =
-    GV.getPerfMeasureRateArray(data, PMD.data) ?? [];
+    GV.getPerfMeasureRateArray(data, PMD.data.performanceMeasure) ?? [];
   const dateRange = data[DC.DATE_RANGE];
   const whyNotReporting = data[DC.WHY_ARE_YOU_NOT_REPORTING];
   const didCalculationsDeviate = data[DC.DID_CALCS_DEVIATE] === DC.YES;
diff --git a/services/ui-src/src/measures/2025/OUDHH/validation.ts b/services/ui-src/src/measures/2025/OUDHH/validation.ts
index b5b1eb757..2f47d9e77 100644
--- a/services/ui-src/src/measures/2025/OUDHH/validation.ts
+++ b/services/ui-src/src/measures/2025/OUDHH/validation.ts
@@ -9,7 +9,7 @@ const OUDValidation = (data: FormData) => {
   const OPM = data[DC.OPM_RATES];
   const ageGroups = PMD.qualifiers;
   const performanceMeasureArray =
-    GV.getPerfMeasureRateArray(data, PMD.data) ?? [];
+    GV.getPerfMeasureRateArray(data, PMD.data.performanceMeasure) ?? [];
   const dateRange = data[DC.DATE_RANGE];
   const whyNotReporting = data[DC.WHY_ARE_YOU_NOT_REPORTING];
   const didCalculationsDeviate = data[DC.DID_CALCS_DEVIATE] === DC.YES;
diff --git a/services/ui-src/src/measures/2025/PPC2AD/validation.ts b/services/ui-src/src/measures/2025/PPC2AD/validation.ts
index 5c6f2dc33..e877db8eb 100644
--- a/services/ui-src/src/measures/2025/PPC2AD/validation.ts
+++ b/services/ui-src/src/measures/2025/PPC2AD/validation.ts
@@ -10,7 +10,7 @@ const PPC2ADValidation = (data: FormData) => {
   const whyNotReporting = data[DC.WHY_ARE_YOU_NOT_REPORTING];
   const OPM = data[DC.OPM_RATES];
   const performanceMeasureArray =
-    GV.getPerfMeasureRateArray(data, PMD.data) ?? [];
+    GV.getPerfMeasureRateArray(data, PMD.data.performanceMeasure) ?? [];
   const dateRange = data[DC.DATE_RANGE];
   const didCalculationsDeviate = data[DC.DID_CALCS_DEVIATE] === DC.YES;
   const deviationReason = data[DC.DEVIATION_REASON];
diff --git a/services/ui-src/src/measures/2025/PPC2CH/validation.ts b/services/ui-src/src/measures/2025/PPC2CH/validation.ts
index 28322402f..747948fd4 100644
--- a/services/ui-src/src/measures/2025/PPC2CH/validation.ts
+++ b/services/ui-src/src/measures/2025/PPC2CH/validation.ts
@@ -10,7 +10,7 @@ const PPC2CHValidation = (data: FormData) => {
   const whyNotReporting = data[DC.WHY_ARE_YOU_NOT_REPORTING];
   const OPM = data[DC.OPM_RATES];
   const performanceMeasureArray =
-    GV.getPerfMeasureRateArray(data, PMD.data) ?? [];
+    GV.getPerfMeasureRateArray(data, PMD.data.performanceMeasure) ?? [];
   const dateRange = data[DC.DATE_RANGE];
   const didCalculationsDeviate = data[DC.DID_CALCS_DEVIATE] === DC.YES;
   const deviationReason = data[DC.DEVIATION_REASON];
diff --git a/services/ui-src/src/measures/2025/PQI01AD/validation.ts b/services/ui-src/src/measures/2025/PQI01AD/validation.ts
index d3048f59c..8fee555ba 100644
--- a/services/ui-src/src/measures/2025/PQI01AD/validation.ts
+++ b/services/ui-src/src/measures/2025/PQI01AD/validation.ts
@@ -12,7 +12,10 @@ const PQI01Validation = (data: FormData) => {
   const didCalculationsDeviate = data[DC.DID_CALCS_DEVIATE] === DC.YES;
   const deviationReason = data[DC.DEVIATION_REASON];
 
-  const performanceMeasureArray = GV.getPerfMeasureRateArray(data, PMD.data);
+  const performanceMeasureArray = GV.getPerfMeasureRateArray(
+    data,
+    PMD.data.performanceMeasure
+  );
   const age65PlusIndex = 0;
   const definitionOfDenominator = data[DC.DEFINITION_OF_DENOMINATOR];
 
diff --git a/services/ui-src/src/measures/2025/PQI05AD/validation.ts b/services/ui-src/src/measures/2025/PQI05AD/validation.ts
index c1b5f9873..0887e2d91 100644
--- a/services/ui-src/src/measures/2025/PQI05AD/validation.ts
+++ b/services/ui-src/src/measures/2025/PQI05AD/validation.ts
@@ -10,7 +10,10 @@ const PQI05Validation = (data: FormData) => {
   const ageGroups = PMD.qualifiers;
   const dateRange = data[DC.DATE_RANGE];
   const whyNotReporting = data[DC.WHY_ARE_YOU_NOT_REPORTING];
-  const performanceMeasureArray = GV.getPerfMeasureRateArray(data, PMD.data);
+  const performanceMeasureArray = GV.getPerfMeasureRateArray(
+    data,
+    PMD.data.performanceMeasure
+  );
   const didCalculationsDeviate = data[DC.DID_CALCS_DEVIATE] === DC.YES;
   const deviationReason = data[DC.DEVIATION_REASON];
 
diff --git a/services/ui-src/src/measures/2025/PQI08AD/validation.ts b/services/ui-src/src/measures/2025/PQI08AD/validation.ts
index 4a0a27369..0a758a5b3 100644
--- a/services/ui-src/src/measures/2025/PQI08AD/validation.ts
+++ b/services/ui-src/src/measures/2025/PQI08AD/validation.ts
@@ -11,7 +11,10 @@ const PQI08Validation = (data: FormData) => {
   const dateRange = data[DC.DATE_RANGE];
   const definitionOfDenominator = data[DC.DEFINITION_OF_DENOMINATOR];
   const whyNotReporting = data[DC.WHY_ARE_YOU_NOT_REPORTING];
-  const performanceMeasureArray = GV.getPerfMeasureRateArray(data, PMD.data);
+  const performanceMeasureArray = GV.getPerfMeasureRateArray(
+    data,
+    PMD.data.performanceMeasure
+  );
   const didCalculationsDeviate = data[DC.DID_CALCS_DEVIATE] === DC.YES;
   const deviationReason = data[DC.DEVIATION_REASON];
   const validateDualPopInformationArray = [
diff --git a/services/ui-src/src/measures/2025/PQI15AD/validation.ts b/services/ui-src/src/measures/2025/PQI15AD/validation.ts
index da707bdb0..0ec75e4dd 100644
--- a/services/ui-src/src/measures/2025/PQI15AD/validation.ts
+++ b/services/ui-src/src/measures/2025/PQI15AD/validation.ts
@@ -12,7 +12,10 @@ const PQI15Validation = (data: FormData) => {
   const didCalculationsDeviate = data[DC.DID_CALCS_DEVIATE] === DC.YES;
   const deviationReason = data[DC.DEVIATION_REASON];
   const dateRange = data[DC.DATE_RANGE];
-  const performanceMeasureArray = GV.getPerfMeasureRateArray(data, PMD.data);
+  const performanceMeasureArray = GV.getPerfMeasureRateArray(
+    data,
+    PMD.data.performanceMeasure
+  );
   let errorArray: any[] = [];
 
   if (data[DC.DID_REPORT] === DC.NO) {
diff --git a/services/ui-src/src/measures/2025/SAAAD/validation.ts b/services/ui-src/src/measures/2025/SAAAD/validation.ts
index 836be50c3..a1277d33b 100644
--- a/services/ui-src/src/measures/2025/SAAAD/validation.ts
+++ b/services/ui-src/src/measures/2025/SAAAD/validation.ts
@@ -9,7 +9,10 @@ const SAAADValidation = (data: FormData) => {
   const ageGroups = PMD.qualifiers;
   const whyNotReporting = data[DC.WHY_ARE_YOU_NOT_REPORTING];
   const OPM = data[DC.OPM_RATES];
-  const performanceMeasureArray = GV.getPerfMeasureRateArray(data, PMD.data);
+  const performanceMeasureArray = GV.getPerfMeasureRateArray(
+    data,
+    PMD.data.performanceMeasure
+  );
   const dateRange = data[DC.DATE_RANGE];
   const didCalculationsDeviate = data[DC.DID_CALCS_DEVIATE] === DC.YES;
   const deviationReason = data[DC.DEVIATION_REASON];
diff --git a/services/ui-src/src/measures/2025/SFMCH/validation.ts b/services/ui-src/src/measures/2025/SFMCH/validation.ts
index 1137086a6..5223632c5 100644
--- a/services/ui-src/src/measures/2025/SFMCH/validation.ts
+++ b/services/ui-src/src/measures/2025/SFMCH/validation.ts
@@ -10,7 +10,10 @@ const SFMCHValidation = (data: FormData) => {
   const whyNotReporting = data[DC.WHY_ARE_YOU_NOT_REPORTING];
   const OPM = data[DC.OPM_RATES];
   const dateRange = data[DC.DATE_RANGE];
-  const performanceMeasureArray = GV.getPerfMeasureRateArray(data, PMD.data);
+  const performanceMeasureArray = GV.getPerfMeasureRateArray(
+    data,
+    PMD.data.performanceMeasure
+  );
   let errorArray: any[] = [];
   const didCalculationsDeviate = data[DC.DID_CALCS_DEVIATE] === DC.YES;
   const deviationReason = data[DC.DEVIATION_REASON];
diff --git a/services/ui-src/src/measures/2025/SSDAD/validation.ts b/services/ui-src/src/measures/2025/SSDAD/validation.ts
index ccb656ea5..37a1c0978 100644
--- a/services/ui-src/src/measures/2025/SSDAD/validation.ts
+++ b/services/ui-src/src/measures/2025/SSDAD/validation.ts
@@ -9,7 +9,10 @@ const SSDValidation = (data: FormData) => {
   const ageGroups = PMD.qualifiers;
   const whyNotReporting = data[DC.WHY_ARE_YOU_NOT_REPORTING];
   const OPM = data[DC.OPM_RATES];
-  const performanceMeasureArray = GV.getPerfMeasureRateArray(data, PMD.data);
+  const performanceMeasureArray = GV.getPerfMeasureRateArray(
+    data,
+    PMD.data.performanceMeasure
+  );
   const dateRange = data[DC.DATE_RANGE];
   const didCalculationsDeviate = data[DC.DID_CALCS_DEVIATE] === DC.YES;
   const deviationReason = data[DC.DEVIATION_REASON];
diff --git a/services/ui-src/src/measures/2025/TFLCH/validation.ts b/services/ui-src/src/measures/2025/TFLCH/validation.ts
index 795846c67..8617c59ab 100644
--- a/services/ui-src/src/measures/2025/TFLCH/validation.ts
+++ b/services/ui-src/src/measures/2025/TFLCH/validation.ts
@@ -10,7 +10,10 @@ const TFLCHValidation = (data: FormData) => {
   const whyNotReporting = data[DC.WHY_ARE_YOU_NOT_REPORTING];
   const OPM = data[DC.OPM_RATES];
   const dateRange = data[DC.DATE_RANGE];
-  const performanceMeasureArray = GV.getPerfMeasureRateArray(data, PMD.data);
+  const performanceMeasureArray = GV.getPerfMeasureRateArray(
+    data,
+    PMD.data.performanceMeasure
+  );
   let errorArray: any[] = [];
   const didCalculationsDeviate = data[DC.DID_CALCS_DEVIATE] === DC.YES;
   const deviationReason = data[DC.DEVIATION_REASON];
@@ -32,9 +35,17 @@ const TFLCHValidation = (data: FormData) => {
   errorArray = [
     ...errorArray,
     // Dental Services rate cannot be larger than the Dental or Oral Health Services rate
-    ...GV.validateOneCatRateHigherThanOtherCatPM(data, PMD.data),
+    ...GV.validateOneCatRateHigherThanOtherCatPM(
+      data,
+      PMD.data.performanceMeasure
+    ),
     // Oral Health Services rate cannot be larger than the Dental or Oral Health Services rate
-    ...GV.validateOneCatRateHigherThanOtherCatPM(data, PMD.data, 0, 2),
+    ...GV.validateOneCatRateHigherThanOtherCatPM(
+      data,
+      PMD.data.performanceMeasure,
+      0,
+      2
+    ),
     ...GV.validateAtLeastOneRateComplete(
       performanceMeasureArray,
       OPM,
diff --git a/services/ui-src/src/measures/2025/W30CH/validation.ts b/services/ui-src/src/measures/2025/W30CH/validation.ts
index 06dc5bc83..58d3376f4 100644
--- a/services/ui-src/src/measures/2025/W30CH/validation.ts
+++ b/services/ui-src/src/measures/2025/W30CH/validation.ts
@@ -9,7 +9,10 @@ const W30CHValidation = (data: FormData) => {
   const ageGroups = PMD.qualifiers;
   const whyNotReporting = data[DC.WHY_ARE_YOU_NOT_REPORTING];
   const OPM = data[DC.OPM_RATES];
-  const performanceMeasureArray = GV.getPerfMeasureRateArray(data, PMD.data);
+  const performanceMeasureArray = GV.getPerfMeasureRateArray(
+    data,
+    PMD.data.performanceMeasure
+  );
   let errorArray: any[] = [];
   const dateRange = data[DC.DATE_RANGE];
   const didCalculationsDeviate = data[DC.DID_CALCS_DEVIATE] === DC.YES;
diff --git a/services/ui-src/src/measures/2025/WCCCH/validation.ts b/services/ui-src/src/measures/2025/WCCCH/validation.ts
index 99be82950..c2fff84d6 100644
--- a/services/ui-src/src/measures/2025/WCCCH/validation.ts
+++ b/services/ui-src/src/measures/2025/WCCCH/validation.ts
@@ -9,7 +9,10 @@ const WCCHValidation = (data: FormData) => {
   const whyNotReporting = data[DC.WHY_ARE_YOU_NOT_REPORTING];
   const OPM = data[DC.OPM_RATES];
   const dateRange = data[DC.DATE_RANGE];
-  const performanceMeasureArray = GV.getPerfMeasureRateArray(data, PMD.data);
+  const performanceMeasureArray = GV.getPerfMeasureRateArray(
+    data,
+    PMD.data.performanceMeasure
+  );
   const didCalculationsDeviate = data[DC.DID_CALCS_DEVIATE] === DC.YES;
   const deviationReason = data[DC.DEVIATION_REASON];
 
diff --git a/services/ui-src/src/measures/2025/WCVCH/validation.ts b/services/ui-src/src/measures/2025/WCVCH/validation.ts
index a4b8a4063..968ef5050 100644
--- a/services/ui-src/src/measures/2025/WCVCH/validation.ts
+++ b/services/ui-src/src/measures/2025/WCVCH/validation.ts
@@ -10,7 +10,7 @@ const WCVCHValidation = (data: FormData) => {
   const whyNotReporting = data[DC.WHY_ARE_YOU_NOT_REPORTING];
   const OPM = data[DC.OPM_RATES];
   const performanceMeasureArray =
-    GV.getPerfMeasureRateArray(data, PMD.data) ?? [];
+    GV.getPerfMeasureRateArray(data, PMD.data.performanceMeasure) ?? [];
   const dateRange = data[DC.DATE_RANGE];
   const didCalculationsDeviate = data[DC.DID_CALCS_DEVIATE] === DC.YES;
   const deviationReason = data[DC.DEVIATION_REASON];