diff --git a/.github/workflows/sonarqube.yml b/.github/workflows/sonarqube.yml
index 66470ed6f..dc9432c2b 100644
--- a/.github/workflows/sonarqube.yml
+++ b/.github/workflows/sonarqube.yml
@@ -5,6 +5,9 @@ on:
     types: [opened, synchronize, reopened]
     branches:
       - develop
+  push:
+    branches:
+      - develop
 
 env:
   PROJECT_NAME: qppa-repos-sonarqube-analysis
diff --git a/ERROR_MESSAGES.md b/ERROR_MESSAGES.md
index 98c6915cf..9c6fb15d1 100644
--- a/ERROR_MESSAGES.md
+++ b/ERROR_MESSAGES.md
@@ -58,4 +58,3 @@ Any text in the following format `(Example)` are considered variables to be fill
 * 53 : CT - The QRDA III file must contain one Category Section v5 with the extension 2020-12-01
 * 54 : CT - The APM to TIN/NPI Combination file is missing.
 * 55 : CT - The Promoting Interoperability section cannot contain PI_HIE_5 with PI_HIE_1, PI_LVOTC_1, PI_HIE_4, or PI_LVITC_2
-* 56 : CT - Review the Clinical Document for program `(program name)`. Only the Promoting Interoperability (PI) measure category is permitted; found `(provided category)`.
diff --git a/acceptance-tests/pom.xml b/acceptance-tests/pom.xml
index a5b7a388f..d8c560825 100644
--- a/acceptance-tests/pom.xml
+++ b/acceptance-tests/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
 	<artifactId>acceptance-tests</artifactId>
 	<groupId>gov.cms.qpp.conversion</groupId>
-	<version>2025.11.19.01-RELEASE</version>
+	<version>2025.12.16.01-RELEASE</version>
 	<name>conversion-tests</name>
 	<packaging>jar</packaging>
 	<properties>
diff --git a/commandline/pom.xml b/commandline/pom.xml
index 447f1339a..2412d2485 100644
--- a/commandline/pom.xml
+++ b/commandline/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>gov.cms.qpp.conversion</groupId>
 		<artifactId>qpp-conversion-tool-parent</artifactId>
-		<version>2025.11.19.01-RELEASE</version>
+		<version>2025.12.16.01-RELEASE</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/commons/pom.xml b/commons/pom.xml
index 0723a3655..ad6b8289c 100644
--- a/commons/pom.xml
+++ b/commons/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>gov.cms.qpp.conversion</groupId>
 		<artifactId>qpp-conversion-tool-parent</artifactId>
-		<version>2025.11.19.01-RELEASE</version>
+		<version>2025.12.16.01-RELEASE</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/commons/src/main/java/gov/cms/qpp/conversion/model/error/ProblemCode.java b/commons/src/main/java/gov/cms/qpp/conversion/model/error/ProblemCode.java
index 62fa4b675..7212efc1b 100644
--- a/commons/src/main/java/gov/cms/qpp/conversion/model/error/ProblemCode.java
+++ b/commons/src/main/java/gov/cms/qpp/conversion/model/error/ProblemCode.java
@@ -121,10 +121,7 @@ public enum ProblemCode implements LocalizedProblem {
 	MEASURE_SECTION_V5_REQUIRES_CATEGORY_SECTION(95, "The QRDA III file must contain one Category Section v5 with the extension 2020-12-01"),
 	MISSING_API_TIN_NPI_FILE(96, "The APM to TIN/NPI Combination file is missing."),
 	PI_RESTRICTED_MEASURES(102, "The Promoting Interoperability section cannot contain "
-		+ "PI_HIE_5 with PI_HIE_1, PI_LVOTC_1, PI_HIE_4, or PI_LVITC_2", false),
-	SSP_PI_ONLY_MEASURE_CATEGORY(109, "Review the Clinical Document for program `(program name)`. "
-		+ "Only the Promoting Interoperability (PI) measure category is permitted; "
-		+ "found `(provided category)`.", true);
+		+ "PI_HIE_5 with PI_HIE_1, PI_LVOTC_1, PI_HIE_4, or PI_LVITC_2", false);
 
 	private static final Map<Integer, ProblemCode> CODE_TO_VALUE = Arrays.stream(values())
 			.collect(Collectors.toMap(ProblemCode::getCode, Function.identity()));
diff --git a/commons/src/main/resources/measures-data.json b/commons/src/main/resources/measures-data.json
index 9e5f934ab..ab9242cce 100644
--- a/commons/src/main/resources/measures-data.json
+++ b/commons/src/main/resources/measures-data.json
@@ -2547,7 +2547,7 @@
     "isBonus": false,
     "reportingCategory": "required",
     "measureSpecification": {
-      "default": "https://qpp.cms.gov/docs/pi_specifications/Measure Specifications/2025-MIPS-Promoting-Interoperability-Measure-Query-of-PDMP.pdf"
+      "default": "https://qpp.cms.gov/docs/pi_specifications/Measure%20Specifications/2025-MIPS-Promoting-Interoperability-Measure-Query-of-PDMP-Updated-Oct2025.pdf"
     },
     "measureSets": [],
     "exclusion": [
@@ -2606,7 +2606,9 @@
     },
     "measureSets": [],
     "exclusion": null,
-    "substitutes": [],
+    "substitutes": [
+      "PI_EP_2_EX_2"
+    ],
     "allowedPrograms": [
       "mips",
       "app1",
@@ -2658,7 +2660,9 @@
     },
     "measureSets": [],
     "exclusion": null,
-    "substitutes": [],
+    "substitutes": [
+      "PI_EP_2_EX_1"
+    ],
     "allowedPrograms": [
       "mips",
       "app1",
@@ -2706,7 +2710,7 @@
     "isBonus": false,
     "reportingCategory": "required",
     "measureSpecification": {
-      "default": "https://qpp.cms.gov/docs/pi_specifications/Measure Specifications/2025-MIPS-Promoting Interoperability-Measure-Electronic-Referral-Loops-by-Sending-Health-Info.pdf"
+      "default": "https://qpp.cms.gov/docs/pi_specifications/Measure%20Specifications/2025-MIPS-Promoting-Interoperability-Measure-Electronic-Referral-Loops-by-Sending-Health-Info-Updated-Oct2025.pdf"
     },
     "measureSets": [],
     "exclusion": [
@@ -2876,7 +2880,7 @@
     "isBonus": false,
     "reportingCategory": "required",
     "measureSpecification": {
-      "default": "https://qpp.cms.gov/docs/pi_specifications/Measure Specifications/2025-MIPS-Promoting-Interoperability-Measure-Enabling-Exchange-Under-TEFCA.pdf"
+      "default": "https://qpp.cms.gov/docs/pi_specifications/Measure%20Specifications/2025-MIPS-Promoting-Interoperability-Measure-Enabling-Exchange-Under-TEFCA-Updated-Oct2025.pdf"
     },
     "measureSets": [],
     "exclusion": null,
@@ -3771,7 +3775,7 @@
     "category": "pi",
     "measureId": "PI_PHCDRR_3",
     "title": "Electronic Case Reporting",
-    "description": "The MIPS eligible clinician is in active engagement with a public health agency to electronically submit case reporting of reportable conditions.",
+    "description": "UPDATE: This measure has been suppressed for the CY 2025 performance period but is still required to be reported. To receive full credit for this measure, you’ll need to attest “Yes” or “No,” or claim an applicable exclusion. (The 25 points for this objective won’t be redistributed to another objective.)\nThe MIPS eligible clinician is in active engagement with a public health agency to electronically submit case reporting of reportable conditions.",
     "metricType": "boolean",
     "firstPerformanceYear": 2017,
     "lastPerformanceYear": null,
@@ -3780,7 +3784,7 @@
     "isBonus": false,
     "reportingCategory": "required",
     "measureSpecification": {
-      "default": "https://qpp.cms.gov/docs/pi_specifications/Measure%20Specifications/2025-MIPS-Promoting-Interoperability-Measure-Electronic-Case-Reporting-Updated-April-2025.pdf"
+      "default": "https://qpp.cms.gov/docs/pi_specifications/Measure%20Specifications/2025-MIPS-Promoting-Interoperability-Measure-Electronic-Case-Reporting-Updated-Oct2025.pdf"
     },
     "measureSets": [],
     "exclusion": [
@@ -15130,7 +15134,7 @@
       "nephrology"
     ],
     "measureSpecification": {
-      "registry": "https://qpp.cms.gov/docs/QPP_quality_measure_specifications/CQM-Measures/2025_Measure_510_MIPSCQM.pdf"
+      "registry": "https://qpp.cms.gov/docs/QPP_quality_measure_specifications/CQM-Measures/2025_Measure_510_MIPSCQM_Addendum.pdf"
     },
     "isSevenPointCapRemoved": false,
     "sevenPointCapRemoved": [],
diff --git a/converter/pom.xml b/converter/pom.xml
index 694ccbdc7..3a3fc1804 100644
--- a/converter/pom.xml
+++ b/converter/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>gov.cms.qpp.conversion</groupId>
 		<artifactId>qpp-conversion-tool-parent</artifactId>
-		<version>2025.11.19.01-RELEASE</version>
+		<version>2025.12.16.01-RELEASE</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
@@ -185,7 +185,7 @@
 		<dependency>
 			<groupId>gov.cms.qpp.conversion</groupId>
 			<artifactId>commons</artifactId>
-			<version>2025.11.19.01-RELEASE</version>
+			<version>2025.12.16.01-RELEASE</version>
 			<scope>compile</scope>
 		</dependency>
 
diff --git a/converter/src/main/java/gov/cms/qpp/conversion/decode/ClinicalDocumentDecoder.java b/converter/src/main/java/gov/cms/qpp/conversion/decode/ClinicalDocumentDecoder.java
index 57f7195f7..eb4b87cd2 100644
--- a/converter/src/main/java/gov/cms/qpp/conversion/decode/ClinicalDocumentDecoder.java
+++ b/converter/src/main/java/gov/cms/qpp/conversion/decode/ClinicalDocumentDecoder.java
@@ -228,18 +228,6 @@ private Pair<String, String> getProgramNameEntityPair(String name) {
 				pair = new ImmutablePair<>(APP_PLUS_PROGRAM_NAME, ENTITY_APM);
 				break;
 
-			case SSP_PI_INDIVIDUAL:
-				pair = new ImmutablePair<>(SSP_PROGRAM_NAME, ENTITY_INDIVIDUAL);
-				break;
-
-			case SSP_PI_GROUP:
-				pair = new ImmutablePair<>(SSP_PROGRAM_NAME, ENTITY_GROUP);
-				break;
-
-			case SSP_PI_APM:
-				pair = new ImmutablePair<>(SSP_PROGRAM_NAME, ENTITY_APM);
-				break;
-
 			default:
 				pair = new ImmutablePair<>(name.toLowerCase(Locale.ENGLISH), ENTITY_INDIVIDUAL);
 				break;
diff --git a/converter/src/main/java/gov/cms/qpp/conversion/encode/ClinicalDocumentEncoder.java b/converter/src/main/java/gov/cms/qpp/conversion/encode/ClinicalDocumentEncoder.java
index 5816140fd..9b557c927 100755
--- a/converter/src/main/java/gov/cms/qpp/conversion/encode/ClinicalDocumentEncoder.java
+++ b/converter/src/main/java/gov/cms/qpp/conversion/encode/ClinicalDocumentEncoder.java
@@ -75,7 +75,7 @@ private void encodeToplevel(JsonWrapper wrapper, Node thisNode) {
 			wrapper.put(ENTITY_ID, thisNode.getValue(ENTITY_ID));
 		}
 
-		if ((Program.isApp(thisNode) || Program.isMips(thisNode) || Program.isAppPlus(thisNode) || Program.isSsp(thisNode))
+		if ((Program.isApp(thisNode) || Program.isMips(thisNode) || Program.isAppPlus(thisNode))
 				&& ENTITY_APM.equalsIgnoreCase(entityType)) {
 			wrapper.put(ENTITY_ID, thisNode.getValue(ENTITY_ID));
 		}
diff --git a/converter/src/main/java/gov/cms/qpp/conversion/encode/PiSectionEncoder.java b/converter/src/main/java/gov/cms/qpp/conversion/encode/PiSectionEncoder.java
index e24025e5a..ad6cff25f 100644
--- a/converter/src/main/java/gov/cms/qpp/conversion/encode/PiSectionEncoder.java
+++ b/converter/src/main/java/gov/cms/qpp/conversion/encode/PiSectionEncoder.java
@@ -56,7 +56,7 @@ private void encodeTopLevelValues(JsonWrapper wrapper, Node node) {
 		wrapper.put(SUBMISSION_METHOD, "electronicHealthRecord");
 		Node topLevelParent = node.getParent();
 		if ((TemplateId.PI_SECTION_V3 == node.getType() || TemplateId.MEASURE_SECTION_V5 == node.getType())
-				&& (Program.isMips(topLevelParent) || Program.isApp(topLevelParent) || Program.isAppPlus(topLevelParent) || Program.isSsp(topLevelParent))) {
+				&& (Program.isMips(topLevelParent) || Program.isApp(topLevelParent) || Program.isAppPlus(topLevelParent))) {
 			wrapper.put(CEHRT, topLevelParent.getValue(CEHRT));
 		}
 	}
diff --git a/converter/src/main/java/gov/cms/qpp/conversion/model/Constants.java b/converter/src/main/java/gov/cms/qpp/conversion/model/Constants.java
index fb8274d8e..81743f80f 100644
--- a/converter/src/main/java/gov/cms/qpp/conversion/model/Constants.java
+++ b/converter/src/main/java/gov/cms/qpp/conversion/model/Constants.java
@@ -65,7 +65,6 @@ public class Constants {
     public static final String ENTITY_VIRTUAL_GROUP = "virtualGroup";
     public static final String APP_PROGRAM_NAME = "app1";
     public static final String APP_PLUS_PROGRAM_NAME = "appPlus";
-    public static final String SSP_PROGRAM_NAME = "ssp";
     public static final String MIPS = "MIPS";
     public static final Set<String> MVP_ENTITIES = Set.of(ENTITY_INDIVIDUAL, ENTITY_GROUP, ENTITY_SUBGROUP, ENTITY_APM);
 
@@ -84,9 +83,6 @@ public class Constants {
     public static final String APP_PLUS_INDIVIDUAL = "APP_PLUS_INDIV";
     public static final String APP_PLUS_GROUP = "APP_PLUS_GROUP";
     public static final String APP_PLUS_APM = "APP_PLUS_APMENTITY";
-    public static final String SSP_PI_INDIVIDUAL = "SSP_PI_INDIV";
-    public static final String SSP_PI_GROUP = "SSP_PI_GROUP";
-    public static final String SSP_PI_APM = "SSP_PI_APMENTITY";
 
     // Library utility class so the constructor is private and empty.
     private Constants() {}
diff --git a/converter/src/main/java/gov/cms/qpp/conversion/model/Program.java b/converter/src/main/java/gov/cms/qpp/conversion/model/Program.java
index cf3935c04..2e316afe5 100644
--- a/converter/src/main/java/gov/cms/qpp/conversion/model/Program.java
+++ b/converter/src/main/java/gov/cms/qpp/conversion/model/Program.java
@@ -16,7 +16,6 @@ public enum Program {
 	MIPS("MIPS_GROUP", "MIPS_INDIV", "MIPS_VIRTUALGROUP", "MIPS", "MIPS_APMENTITY", "MIPS_SUBGROUP"),
 	APP("MIPS_APP1_INDIV", "MIPS_APP1_GROUP", "MIPS_APP1_APMENTITY"),
 	APP_PLUS("APP_PLUS_INDIV", "APP_PLUS_GROUP", "APP_PLUS_APMENTITY"),
-	SSP("SSP_PI_INDIV", "SSP_PI_GROUP", "SSP_PI_APMENTITY"),
 	ALL;
 
 	private final Set<String> aliases;
@@ -60,16 +59,6 @@ public static boolean isAppPlus(Node node) {
 		return extractProgram(node) == Program.APP_PLUS;
 	}
 
-	/**
-	 * Checks if a node is using the ssp program
-	 *
-	 * @param node
-	 * @return
-	 */
-	public static boolean isSsp(Node node) {
-		return extractProgram(node) == Program.SSP;
-	}
-
 	/**
 	 * Extracts a program type from a node
 	 *
diff --git a/converter/src/main/java/gov/cms/qpp/conversion/validate/ClinicalDocumentValidator.java b/converter/src/main/java/gov/cms/qpp/conversion/validate/ClinicalDocumentValidator.java
index 7232660f7..f69e04066 100644
--- a/converter/src/main/java/gov/cms/qpp/conversion/validate/ClinicalDocumentValidator.java
+++ b/converter/src/main/java/gov/cms/qpp/conversion/validate/ClinicalDocumentValidator.java
@@ -53,7 +53,7 @@ protected void performValidation(final Node node) {
 			String entityType = Optional.ofNullable(node.getValue(ENTITY_TYPE)).orElse("<missing>");
 
 			forceCheckErrors(node).valueIn(ProblemCode.CLINICAL_DOCUMENT_INCORRECT_PROGRAM_NAME.format(VALID_PROGRAM_NAMES, programName),
-				PROGRAM_NAME, MIPS_PROGRAM_NAME, APP_PROGRAM_NAME, APP_PLUS_PROGRAM_NAME, SSP_PROGRAM_NAME);
+				PROGRAM_NAME, MIPS_PROGRAM_NAME, APP_PROGRAM_NAME, APP_PLUS_PROGRAM_NAME);
 
 			if (ENTITY_VIRTUAL_GROUP.equals(entityType)) {
 				forceCheckErrors(node).value(ProblemCode.VIRTUAL_GROUP_ID_REQUIRED, ENTITY_ID);
diff --git a/converter/src/main/java/gov/cms/qpp/conversion/validate/SspClinicalDocumentValidator.java b/converter/src/main/java/gov/cms/qpp/conversion/validate/SspClinicalDocumentValidator.java
deleted file mode 100644
index 662a2e60a..000000000
--- a/converter/src/main/java/gov/cms/qpp/conversion/validate/SspClinicalDocumentValidator.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package gov.cms.qpp.conversion.validate;
-
-import gov.cms.qpp.conversion.model.Node;
-import gov.cms.qpp.conversion.model.Program;
-import gov.cms.qpp.conversion.model.TemplateId;
-import gov.cms.qpp.conversion.model.Validator;
-import gov.cms.qpp.conversion.model.error.LocalizedProblem;
-import gov.cms.qpp.conversion.model.error.ProblemCode;
-
-import java.util.Locale;
-
-import static gov.cms.qpp.conversion.model.Constants.CATEGORY;
-import static gov.cms.qpp.conversion.model.Constants.PROGRAM_NAME;
-
-@Validator(value = TemplateId.CLINICAL_DOCUMENT, program = Program.SSP)
-public class SspClinicalDocumentValidator extends NodeValidator {
-    private static final String ALLOWED_CATEGORY = "pi";
-
-    @Override
-    protected void performValidation(Node clinicalDocument) {
-        String programName = clinicalDocument.getValue(PROGRAM_NAME).toUpperCase(Locale.ROOT);
-        clinicalDocument
-                .getChildNodes(TemplateId.MEASURE_SECTION_V5)
-                .forEach(sectionNode -> {
-                    String category = sectionNode.getValue(CATEGORY);
-                    System.out.println("category: " + category);
-                    if (category == null || !ALLOWED_CATEGORY.equalsIgnoreCase(category)) {
-                        LocalizedProblem error = ProblemCode.SSP_PI_ONLY_MEASURE_CATEGORY
-                                .format(programName, category == null ? "none" : category);
-                        checkErrors(sectionNode)
-                                .valueIn(error, CATEGORY, ALLOWED_CATEGORY);
-                    }
-                });
-    }
-}
\ No newline at end of file
diff --git a/converter/src/test/java/gov/cms/qpp/conversion/model/ProgramTest.java b/converter/src/test/java/gov/cms/qpp/conversion/model/ProgramTest.java
index ab9d41006..b5e5a27c3 100644
--- a/converter/src/test/java/gov/cms/qpp/conversion/model/ProgramTest.java
+++ b/converter/src/test/java/gov/cms/qpp/conversion/model/ProgramTest.java
@@ -109,41 +109,6 @@ void testIsAppPlusAppEntityIsTrue() {
 		assertThat(Program.isAppPlus(node)).isTrue();
 	}
 
-	@Test
-	void testIsSspIndividualIsTrue() {
-		Node node = new Node();
-		node.putValue(RAW_PROGRAM_NAME, "SSP_PI_INDIV");
-		assertThat(Program.isSsp(node)).isTrue();
-	}
-
-	@Test
-	void testIsSspGroupIsTrue() {
-		Node node = new Node();
-		node.putValue(RAW_PROGRAM_NAME, "SSP_PI_GROUP");
-		assertThat(Program.isSsp(node)).isTrue();
-	}
-
-	@Test
-	void testIsSspAppEntityIsTrue() {
-		Node node = new Node();
-		node.putValue(RAW_PROGRAM_NAME, "SSP_PI_APMENTITY");
-		assertThat(Program.isSsp(node)).isTrue();
-	}
-
-	@Test
-	void testIsSspReturnsFalseForMips() {
-		Node node = new Node();
-		node.putValue(RAW_PROGRAM_NAME, "MIPS_INDIV");
-		assertThat(Program.isSsp(node)).isFalse();
-	}
-
-	@Test
-	void testIsSspReturnsFalseForNullValue() {
-		Node node = new Node();
-		node.putValue(RAW_PROGRAM_NAME, null);
-		assertThat(Program.isSsp(node)).isFalse();
-	}
-
 	@Override
 	public Class<? extends Enum<?>> getEnumType() {
 		return Program.class;
diff --git a/converter/src/test/java/gov/cms/qpp/conversion/validate/SspClinicalDocumentValidatorTest.java b/converter/src/test/java/gov/cms/qpp/conversion/validate/SspClinicalDocumentValidatorTest.java
deleted file mode 100644
index 920453d98..000000000
--- a/converter/src/test/java/gov/cms/qpp/conversion/validate/SspClinicalDocumentValidatorTest.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package gov.cms.qpp.conversion.validate;
-
-import static com.google.common.truth.Truth.assertWithMessage;
-
-import java.util.List;
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import gov.cms.qpp.conversion.model.Node;
-import gov.cms.qpp.conversion.model.TemplateId;
-import gov.cms.qpp.conversion.model.error.Detail;
-import gov.cms.qpp.conversion.model.error.ProblemCode;
-import gov.cms.qpp.conversion.model.error.correspondence.DetailsErrorEquals;
-
-class SspClinicalDocumentValidatorTest {
-
-    private Node clinicalDocumentNode;
-    private Node measureSectionNode;
-
-    @BeforeEach
-    void setUp() {
-        clinicalDocumentNode = new Node(TemplateId.CLINICAL_DOCUMENT);
-        clinicalDocumentNode.putValue("programName", "SSP");
-
-        measureSectionNode = new Node(TemplateId.MEASURE_SECTION_V5);
-    }
-
-    @Test
-    void testValidCategory_NoErrors() {
-        measureSectionNode.putValue("category", "pi");
-        clinicalDocumentNode.addChildNode(measureSectionNode);
-
-        SspClinicalDocumentValidator validator = new SspClinicalDocumentValidator();
-        List<Detail> errors = validator.validateSingleNode(clinicalDocumentNode).getErrors();
-
-        assertWithMessage("There should be no errors for category 'pi'")
-                .that(errors).isEmpty();
-    }
-
-    @Test
-    void testNullCategory_ShouldError() {
-        // category is not set
-        clinicalDocumentNode.addChildNode(measureSectionNode);
-
-        SspClinicalDocumentValidator validator = new SspClinicalDocumentValidator();
-        List<Detail> errors = validator.validateSingleNode(clinicalDocumentNode).getErrors();
-
-        assertWithMessage("Must report SSP_PI_ONLY_MEASURE_CATEGORY when category is null")
-                .that(errors)
-                .comparingElementsUsing(DetailsErrorEquals.INSTANCE)
-                .containsExactly(
-                        ProblemCode.SSP_PI_ONLY_MEASURE_CATEGORY.format("SSP", "none")
-                );
-    }
-
-    @Test
-    void testInvalidCategory_ShouldError() {
-        measureSectionNode.putValue("category", "invalid");
-        clinicalDocumentNode.addChildNode(measureSectionNode);
-
-        SspClinicalDocumentValidator validator = new SspClinicalDocumentValidator();
-        List<Detail> errors = validator.validateSingleNode(clinicalDocumentNode).getErrors();
-
-        assertWithMessage("Must report SSP_PI_ONLY_MEASURE_CATEGORY when category is invalid")
-                .that(errors)
-                .comparingElementsUsing(DetailsErrorEquals.INSTANCE)
-                .containsExactly(
-                        ProblemCode.SSP_PI_ONLY_MEASURE_CATEGORY.format("SSP", "invalid")
-                );
-    }
-}
diff --git a/converter/src/test/resources/ssp/2025/ssp-ApmEntity-Qrda-III.xml b/converter/src/test/resources/ssp/2025/ssp-ApmEntity-Qrda-III.xml
deleted file mode 100644
index 00c7d9233..000000000
--- a/converter/src/test/resources/ssp/2025/ssp-ApmEntity-Qrda-III.xml
+++ /dev/null
@@ -1,382 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?xml-stylesheet type="text/xsl" href="qrda.xsl"?>
-<ClinicalDocument xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                  xsi:schemaLocation="urn:hl7-org:v3 ../CDA_Schema_Files/infrastructure/cda/CDA_SDTC.xsd"
-                  xmlns="urn:hl7-org:v3" xmlns:voc="urn:hl7-org:v3/voc">
-    <!--
-********************************************************
-CDA Header
-********************************************************
--->
-    <realmCode code="US"/>
-    <typeId root="2.16.840.1.113883.1.3" extension="POCD_HD000040"/>
-    <templateId root="2.16.840.1.113883.10.20.27.1.1" extension="2017-06-01"/>
-    <templateId root="2.16.840.1.113883.10.20.27.1.2" extension="2024-12-01"/>
-    <id root="26a42253-99f5-48e7-9274-b467c6c7f623"/>
-    <code code="55184-6" codeSystem="2.16.840.1.113883.6.1" codeSystemName="LOINC"
-          displayName="Quality Reporting Document Architecture Calculated Summary Report"/>
-    <title>2017 Eligible Clinicians (EC) and Eligible Professionals (EP) Sample QRDA-III</title>
-    <effectiveTime value="20170311061231"/>
-    <confidentialityCode codeSystem="2.16.840.1.113883.5.25" code="N"/>
-    <languageCode code="en"/>
-    <setId root="ae23711d-783d-4f5e-b942-4084b467848b"/>
-    <versionNumber value="1"/>
-    <recordTarget>
-        <patientRole>
-            <id nullFlavor="NA"/>
-        </patientRole>
-    </recordTarget>
-    <author>
-        <time value="20170131061231"/>
-        <assignedAuthor>
-            <id root="3d0a32f3-5164-4a6f-8922-de3badf83de4"/>
-            <assignedAuthoringDevice>
-                <softwareName>SOME Data Aggregator Transform Tool AS00016dev</softwareName>
-            </assignedAuthoringDevice>
-            <representedOrganization>
-                <id root="2.16.840.1.113883.19.5" extension="223344"/>
-                <name>Good Health Clinic</name>
-            </representedOrganization>
-        </assignedAuthor>
-    </author>
-    <author>
-        <time value="20170131114411"/>
-        <assignedAuthor>
-            <id root="2.16.840.1.113883.4.6" extension="1234567893" assigningAuthorityName="NPI"/>
-            <assignedPerson>
-                <name>
-                    <given>Trevor</given>
-                    <family>Philips</family>
-                </name>
-            </assignedPerson>
-            <representedOrganization>
-                <id root="2.16.840.1.113883.19.5" extension="223344"/>
-                <name>Good Health Clinic</name>
-            </representedOrganization>
-        </assignedAuthor>
-    </author>
-    <custodian>
-        <assignedCustodian>
-            <representedCustodianOrganization>
-                <id root="2.16.840.1.113883.19.5" extension="223344"/>
-                <name>Good Health Clinic</name>
-            </representedCustodianOrganization>
-        </assignedCustodian>
-    </custodian>
-    <informationRecipient>
-        <intendedRecipient>
-            <id root="2.16.840.1.113883.3.249.7" extension="SSP_PI_APMENTITY"/>
-        </intendedRecipient>
-    </informationRecipient>
-    <legalAuthenticator>
-        <time value="20170312153222"/>
-        <signatureCode code="S"/>
-        <assignedEntity>
-            <id root="bc01a5d1-3a34-4286-82cc-43eb04c972a7"/>
-            <representedOrganization>
-                <id root="2.16.840.1.113883.19.5" extension="223344"/>
-                <name>Good Health Clinic</name>
-            </representedOrganization>
-        </assignedEntity>
-    </legalAuthenticator>
-    <participant typeCode="DEV">
-        <associatedEntity classCode="RGPR">
-            <id root="2.16.840.1.113883.3.2074.1" extension="XX15CXXXXXXXXXX" />
-            <code code="129465004" displayName="medical record, device" codeSystem="2.16.840.1.113883.6.96" codeSystemName="SNOMED-CT" />
-        </associatedEntity>
-    </participant>
-    <documentationOf typeCode="DOC">
-        <serviceEvent classCode="PCPR">
-            <effectiveTime>
-                <low value="20170101"/>
-                <high value="20171231"/>
-            </effectiveTime>
-            <performer typeCode="PRF">
-                <time>
-                    <low value="20170101"/>
-                    <high value="20171231"/>
-                </time>
-                <assignedEntity>
-                    <representedOrganization>
-                        <id root="2.16.840.1.113883.3.249.5.4" extension="MIPS1001"/>
-                        <name>Good Health Clinic</name>
-                    </representedOrganization>
-                </assignedEntity>
-            </performer>
-        </serviceEvent>
-    </documentationOf>
-    <authorization>
-        <consent>
-            <id root="da2c8a32-d76b-4c37-a1f4-137485387650"/>
-            <code code="425691002" displayName="consent given for electronic record sharing"
-                  codeSystem="2.16.840.1.113883.6.96" codeSystemName="SNOMED-CT"/>
-            <statusCode code="completed"/>
-        </consent>
-    </authorization>
-    <!--
-    ********************************************************
-    CDA Body
-    ********************************************************
-    -->
-    <component>
-        <structuredBody>
-            <!--
-              ********************************************************
-              Promoting Interoperability Section (V3)
-              urn:hl7ii:2.16.840.1.113883.10.20.27.2.5:2020-12-01
-              ********************************************************
-              -->
-            <component>
-                <section>
-                    <!-- Measure Section -->
-                    <templateId root="2.16.840.1.113883.10.20.24.2.2"/>
-                    <!-- Promoting Interoperability Information Section (V3) templateId -->
-                    <templateId root="2.16.840.1.113883.10.20.27.2.5" extension="2020-12-01"/>
-                    <code code="55186-1" codeSystem="2.16.840.1.113883.6.1" displayName="Measure Section"/>
-                    <title>Measure Section</title>
-                    <text>
-                        <table border="1" width="100%">
-                            <tbody>
-                                <tr>
-                                    <th>Reporting Period: January 01, 2023 - December 31, 2023</th>
-                                </tr>
-                            </tbody>
-                        </table>
-                        <table border="1" width="100%">
-                            <thead>
-                                <tr>
-                                    <th>PI Measure Title</th>
-                                    <th>Measure Identifier</th>
-                                </tr>
-                            </thead>
-                            <tbody>
-                                <tr>
-                                    <td>Query of the Prescription Drug Monitoring Program (PDMP)</td>
-                                    <td>PI_EP_2</td>
-                                </tr>
-                            </tbody>
-                        </table>
-                        <list>
-                            <item>
-                                <content styleCode="Bold">Measure Answer (Yes/No): </content>Yes</item>
-                        </list>
-                        <table border="1" width="100%">
-                            <thead>
-                                <tr>
-                                    <th>PI Measure Title</th>
-                                    <th>Measure Identifier</th>
-                                </tr>
-                            </thead>
-                            <tbody>
-                                <tr>
-                                    <td>e-Prescribing</td>
-                                    <td>PI_EP_1</td>
-                                </tr>
-                            </tbody>
-                        </table>
-                        <list>
-                            <item>
-                                <content styleCode="Bold">Denominator: </content>800</item>
-                            <item>
-                                <content styleCode="Bold">Numerator: </content>750</item>
-                        </list>
-                        <table border="1" width="100%">
-                            <thead>
-                                <tr>
-                                    <th>PI Measure Title</th>
-                                    <th>Measure Identifier</th>
-                                </tr>
-                            </thead>
-                            <tbody>
-                                <tr>
-                                    <td>Provide Patients Electronic Access to their Health Information</td>
-                                    <td>PI_PEA_1</td>
-                                </tr>
-                            </tbody>
-                        </table>
-                        <list>
-                            <item>
-                                <content styleCode="Bold">Denominator: </content>800</item>
-                            <item>
-                                <content styleCode="Bold">Numerator: </content>600</item>
-                        </list>
-                    </text>
-                    <!-- PI_EP_2 which is an example of PI measure with reporting metric of boolean -->
-                    <entry>
-                        <organizer classCode="CLUSTER" moodCode="EVN">
-                            <!-- Implied template Measure Reference templateId -->
-                            <templateId root="2.16.840.1.113883.10.20.24.3.98"/>
-                            <!-- Promoting Interoperability Numerator Measure Performed Measure Reference and Results templateId -->
-                            <templateId root="2.16.840.1.113883.10.20.27.3.29" extension="2016-09-01"/>
-                            <id root="ac575aef-7062-4ea2-b723-df517cfa470a"/>
-                            <statusCode code="completed"/>
-                            <reference typeCode="REFR">
-                                <!-- Reference to a particular PI measure's unique identifier. -->
-                                <externalDocument classCode="DOC" moodCode="EVN">
-                                    <!-- extension is the unique identifier for a PI measure. -->
-                                    <id root="2.16.840.1.113883.3.7031" extension="PI_EP_2"/>
-                                    <!-- PI measure title -->
-                                    <text>Query of the Prescription Drug Monitoring Program (PDMP)</text>
-                                </externalDocument>
-                            </reference>
-                            <component>
-                                <observation classCode="OBS" moodCode="EVN">
-                                    <!-- Measure Performed templateId -->
-                                    <templateId root="2.16.840.1.113883.10.20.27.3.27" extension="2016-09-01"/>
-                                    <code code="ASSERTION" codeSystem="2.16.840.1.113883.5.4"
-                                          codeSystemName="ActCode" displayName="Assertion"/>
-                                    <statusCode code="completed"/>
-                                    <value xsi:type="CD" code="Y" codeSystem="2.16.840.1.113883.12.136"
-                                           codeSystemName="Yes/no indicator (HL7 Table 0136)" displayName="Yes"/>
-                                </observation>
-                            </component>
-                        </organizer>
-                    </entry>
-                    <!-- PI_EP_1 which is an example of PI measure with reporting metric of proportion -->
-                    <entry>
-                        <organizer classCode="CLUSTER" moodCode="EVN">
-                            <!-- Implied template Measure Reference templateId -->
-                            <templateId root="2.16.840.1.113883.10.20.24.3.98"/>
-                            <!-- PI Numerator Denominator Type Measure Reference and Results V2 templateId -->
-                            <templateId root="2.16.840.1.113883.10.20.27.3.28" extension="2017-06-01"/>
-                            <id root="ac575aef-7062-4ea2-b723-df517cfa470a"/>
-                            <statusCode code="completed"/>
-                            <reference typeCode="REFR">
-                                <!-- Reference to a particular PI measure's unique identifier. -->
-                                <externalDocument classCode="DOC" moodCode="EVN">
-                                    <!-- extension is the unique identifier for an PI measure. -->
-                                    <id root="2.16.840.1.113883.3.7031" extension="PI_EP_1"/>
-                                    <!-- PI measure title -->
-                                    <text>e-Prescribing</text>
-                                </externalDocument>
-                            </reference>
-                            <component>
-                                <observation classCode="OBS" moodCode="EVN">
-                                    <!-- PI Numerator Denominator Type Measure Numerator Data templateId -->
-                                    <templateId root="2.16.840.1.113883.10.20.27.3.31" extension="2016-09-01"/>
-                                    <code code="ASSERTION" codeSystem="2.16.840.1.113883.5.4"
-                                          codeSystemName="ActCode" displayName="Assertion"/>
-                                    <statusCode code="completed"/>
-                                    <value xsi:type="CD" code="NUMER" codeSystem="2.16.840.1.113883.5.4"
-                                           codeSystemName="ActCode"/>
-                                    <!-- Numerator Count-->
-                                    <entryRelationship typeCode="SUBJ" inversionInd="true">
-                                        <observation classCode="OBS" moodCode="EVN">
-                                            <templateId root="2.16.840.1.113883.10.20.27.3.3"/>
-                                            <code code="MSRAGG" codeSystem="2.16.840.1.113883.5.4"
-                                                  codeSystemName="ActCode" displayName="rate aggregation"/>
-                                            <value xsi:type="INT" value="750"/>
-                                            <methodCode code="COUNT" codeSystem="2.16.840.1.113883.5.84"
-                                                        codeSystemName="ObservationMethod" displayName="Count"/>
-                                        </observation>
-                                    </entryRelationship>
-                                </observation>
-                            </component>
-                            <component>
-                                <observation classCode="OBS" moodCode="EVN">
-                                    <!-- PI Numerator Denominator Type Measure Denominator Data templateId -->
-                                    <templateId root="2.16.840.1.113883.10.20.27.3.32" extension="2016-09-01"/>
-                                    <code code="ASSERTION" codeSystem="2.16.840.1.113883.5.4"
-                                          codeSystemName="ActCode" displayName="Assertion"/>
-                                    <statusCode code="completed"/>
-                                    <value xsi:type="CD" code="DENOM" codeSystem="2.16.840.1.113883.5.4"
-                                           codeSystemName="ActCode"/>
-                                    <!-- Denominator Count-->
-                                    <entryRelationship typeCode="SUBJ" inversionInd="true">
-                                        <observation classCode="OBS" moodCode="EVN">
-                                            <templateId root="2.16.840.1.113883.10.20.27.3.3"/>
-                                            <code code="MSRAGG" codeSystem="2.16.840.1.113883.5.4"
-                                                  codeSystemName="ActCode" displayName="rate aggregation"/>
-                                            <value xsi:type="INT" value="800"/>
-                                            <methodCode code="COUNT" codeSystem="2.16.840.1.113883.5.84"
-                                                        codeSystemName="ObservationMethod" displayName="Count"/>
-                                        </observation>
-                                    </entryRelationship>
-                                </observation>
-                            </component>
-                        </organizer>
-                    </entry>
-                    <!-- PI_PEA_1 which is an example of a proportion PI measure -->
-                    <entry>
-                        <organizer classCode="CLUSTER" moodCode="EVN">
-                            <!-- Implied template Measure Reference templateId -->
-                            <templateId root="2.16.840.1.113883.10.20.24.3.98"/>
-                            <!-- PI Numerator Denominator Type Measure Reference and Results V2 templateId -->
-                            <templateId root="2.16.840.1.113883.10.20.27.3.28" extension="2017-06-01"/>
-                            <id root="ac575aef-7062-4ea2-b723-df517cfa470a"/>
-                            <statusCode code="completed"/>
-                            <reference typeCode="REFR">
-                                <!-- Reference to a particular PI measure's unique identifier. -->
-                                <externalDocument classCode="DOC" moodCode="EVN">
-                                    <!-- extension is the unique identifier for an PI measure. -->
-                                    <id root="2.16.840.1.113883.3.7031" extension="PI_PEA_1"/>
-                                    <!-- PI measure title -->
-                                    <text>Provide Patients Electronic Access to their Health
-                                        Information</text>
-                                </externalDocument>
-                            </reference>
-                            <component>
-                                <observation classCode="OBS" moodCode="EVN">
-                                    <!-- PI Numerator Denominator Type Measure Numerator Data templateId -->
-                                    <templateId root="2.16.840.1.113883.10.20.27.3.31" extension="2016-09-01"/>
-                                    <code code="ASSERTION" codeSystem="2.16.840.1.113883.5.4"
-                                          codeSystemName="ActCode" displayName="Assertion"/>
-                                    <statusCode code="completed"/>
-                                    <value xsi:type="CD" code="NUMER" codeSystem="2.16.840.1.113883.5.4"
-                                           codeSystemName="ActCode"/>
-                                    <!-- Numerator Count-->
-                                    <entryRelationship typeCode="SUBJ" inversionInd="true">
-                                        <observation classCode="OBS" moodCode="EVN">
-                                            <templateId root="2.16.840.1.113883.10.20.27.3.3"/>
-                                            <code code="MSRAGG" codeSystem="2.16.840.1.113883.5.4"
-                                                  codeSystemName="ActCode" displayName="rate aggregation"/>
-                                            <value xsi:type="INT" value="600"/>
-                                            <methodCode code="COUNT" codeSystem="2.16.840.1.113883.5.84"
-                                                        codeSystemName="ObservationMethod" displayName="Count"/>
-                                        </observation>
-                                    </entryRelationship>
-                                </observation>
-                            </component>
-                            <component>
-                                <observation classCode="OBS" moodCode="EVN">
-                                    <!-- PI Numerator Denominator Type Measure Denominator Data templateId -->
-                                    <templateId root="2.16.840.1.113883.10.20.27.3.32" extension="2016-09-01"/>
-                                    <code code="ASSERTION" codeSystem="2.16.840.1.113883.5.4"
-                                          codeSystemName="ActCode" displayName="Assertion"/>
-                                    <statusCode code="completed"/>
-                                    <value xsi:type="CD" code="DENOM" codeSystem="2.16.840.1.113883.5.4"
-                                           codeSystemName="ActCode"/>
-                                    <!-- Denominator Count-->
-                                    <entryRelationship typeCode="SUBJ" inversionInd="true">
-                                        <observation classCode="OBS" moodCode="EVN">
-                                            <templateId root="2.16.840.1.113883.10.20.27.3.3"/>
-                                            <code code="MSRAGG" codeSystem="2.16.840.1.113883.5.4"
-                                                  codeSystemName="ActCode" displayName="rate aggregation"/>
-                                            <value xsi:type="INT" value="800"/>
-                                            <methodCode code="COUNT" codeSystem="2.16.840.1.113883.5.84"
-                                                        codeSystemName="ObservationMethod" displayName="Count"/>
-                                        </observation>
-                                    </entryRelationship>
-                                </observation>
-                            </component>
-                        </organizer>
-                    </entry>
-                    <!-- Performance Period -->
-                    <entry typeCode="DRIV">
-                        <act classCode="ACT" moodCode="EVN">
-                            <!-- Reporting Parameters Act (V2) -->
-                            <templateId root="2.16.840.1.113883.10.20.17.3.8" extension="2020-12-01"/>
-                            <id root="95944FB8-241B-11E5-1027-09173F13E4C5"/>
-                            <code code="252116004" codeSystem="2.16.840.1.113883.6.96"
-                                  displayName="Observation Parameters"/>
-                            <effectiveTime>
-                                <low value="20250101"/>
-                                <high value="20251231"/>
-                            </effectiveTime>
-                        </act>
-                    </entry>
-                </section>
-            </component>
-        </structuredBody>
-    </component>
-</ClinicalDocument>
diff --git a/converter/src/test/resources/ssp/2025/ssp-Group-QRDA-III.xml b/converter/src/test/resources/ssp/2025/ssp-Group-QRDA-III.xml
deleted file mode 100644
index 9abb8fd14..000000000
--- a/converter/src/test/resources/ssp/2025/ssp-Group-QRDA-III.xml
+++ /dev/null
@@ -1,395 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?xml-stylesheet type="text/xsl" href="qrda.xsl"?>
-<ClinicalDocument xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                  xsi:schemaLocation="urn:hl7-org:v3 ../CDA_Schema_Files/infrastructure/cda/CDA_SDTC.xsd"
-                  xmlns="urn:hl7-org:v3" xmlns:voc="urn:hl7-org:v3/voc">
-    <!--
-********************************************************
-CDA Header
-********************************************************
--->
-    <realmCode code="US"/>
-    <typeId root="2.16.840.1.113883.1.3" extension="POCD_HD000040"/>
-    <templateId root="2.16.840.1.113883.10.20.27.1.1" extension="2017-06-01"/>
-    <templateId root="2.16.840.1.113883.10.20.27.1.2" extension="2024-12-01"/>
-    <id root="26a42253-99f5-48e7-9274-b467c6c7f623"/>
-    <code code="55184-6" codeSystem="2.16.840.1.113883.6.1" codeSystemName="LOINC"
-          displayName="Quality Reporting Document Architecture Calculated Summary Report"/>
-    <title>2017 Eligible Clinicians (EC) and Eligible Professionals (EP) Sample QRDA-III</title>
-    <effectiveTime value="20170311061231"/>
-    <confidentialityCode codeSystem="2.16.840.1.113883.5.25" code="N"/>
-    <languageCode code="en"/>
-    <setId root="ae23711d-783d-4f5e-b942-4084b467848b"/>
-    <versionNumber value="1"/>
-    <recordTarget>
-        <patientRole>
-            <id nullFlavor="NA"/>
-        </patientRole>
-    </recordTarget>
-    <author>
-        <time value="20170131061231"/>
-        <assignedAuthor>
-            <id root="3d0a32f3-5164-4a6f-8922-de3badf83de4"/>
-            <assignedAuthoringDevice>
-                <softwareName>SOME Data Aggregator Transform Tool AS00016dev</softwareName>
-            </assignedAuthoringDevice>
-            <representedOrganization>
-                <id root="2.16.840.1.113883.19.5" extension="223344"/>
-                <name>Good Health Clinic</name>
-            </representedOrganization>
-        </assignedAuthor>
-    </author>
-    <author>
-        <time value="20170131114411"/>
-        <assignedAuthor>
-            <id root="2.16.840.1.113883.4.6" extension="1234567893" assigningAuthorityName="NPI"/>
-            <assignedPerson>
-                <name>
-                    <given>Trevor</given>
-                    <family>Philips</family>
-                </name>
-            </assignedPerson>
-            <representedOrganization>
-                <id root="2.16.840.1.113883.19.5" extension="223344"/>
-                <name>Good Health Clinic</name>
-            </representedOrganization>
-        </assignedAuthor>
-    </author>
-    <custodian>
-        <assignedCustodian>
-            <representedCustodianOrganization>
-                <id root="2.16.840.1.113883.19.5" extension="223344"/>
-                <name>Good Health Clinic</name>
-            </representedCustodianOrganization>
-        </assignedCustodian>
-    </custodian>
-    <informationRecipient>
-        <intendedRecipient>
-            <id root="2.16.840.1.113883.3.249.7" extension="SSP_PI_GROUP"/>
-        </intendedRecipient>
-    </informationRecipient>
-    <legalAuthenticator>
-        <time value="20170312153222"/>
-        <signatureCode code="S"/>
-        <assignedEntity>
-            <id root="bc01a5d1-3a34-4286-82cc-43eb04c972a7"/>
-            <representedOrganization>
-                <id root="2.16.840.1.113883.19.5" extension="223344"/>
-                <name>Good Health Clinic</name>
-            </representedOrganization>
-        </assignedEntity>
-    </legalAuthenticator>
-    <participant typeCode="DEV">
-        <associatedEntity classCode="RGPR">
-            <id root="2.16.840.1.113883.3.2074.1" extension="XX15CXXXXXXXXXX" />
-            <code code="129465004" displayName="medical record, device" codeSystem="2.16.840.1.113883.6.96" codeSystemName="SNOMED-CT" />
-        </associatedEntity>
-    </participant>
-    <documentationOf typeCode="DOC">
-        <serviceEvent classCode="PCPR">
-            <effectiveTime>
-                <low value="20170101"/>
-                <high value="20171231"/>
-            </effectiveTime>
-            <performer typeCode="PRF">
-                <time>
-                    <low value="20170101"/>
-                    <high value="20171231"/>
-                </time>
-                <assignedEntity>
-                    <representedOrganization>
-                        <id root="2.16.840.1.113883.3.249.5.4" extension="MIPS1001"/>
-                        <name>Good Health Clinic</name>
-                    </representedOrganization>
-                </assignedEntity>
-            </performer>
-            <performer>
-                <time>
-                    <low value="20250101"/>
-                    <high value="20251231"/>
-                </time>
-                <assignedEntity>
-                    <id root="2.16.840.1.113883.4.6" extension="2567891421"/>
-                    <representedOrganization>
-                        <id root="2.16.840.1.113883.4.2" extension="990000099"/>
-                        <name>Good Healthcare Practice</name>
-                    </representedOrganization>
-                </assignedEntity>
-            </performer>
-        </serviceEvent>
-    </documentationOf>
-    <authorization>
-        <consent>
-            <id root="da2c8a32-d76b-4c37-a1f4-137485387650"/>
-            <code code="425691002" displayName="consent given for electronic record sharing"
-                  codeSystem="2.16.840.1.113883.6.96" codeSystemName="SNOMED-CT"/>
-            <statusCode code="completed"/>
-        </consent>
-    </authorization>
-    <!--
-    ********************************************************
-    CDA Body
-    ********************************************************
-    -->
-    <component>
-        <structuredBody>
-            <!--
-              ********************************************************
-              Promoting Interoperability Section (V3)
-              urn:hl7ii:2.16.840.1.113883.10.20.27.2.5:2020-12-01
-              ********************************************************
-              -->
-            <component>
-                <section>
-                    <!-- Measure Section -->
-                    <templateId root="2.16.840.1.113883.10.20.24.2.2"/>
-                    <!-- Promoting Interoperability Information Section (V3) templateId -->
-                    <templateId root="2.16.840.1.113883.10.20.27.2.5" extension="2020-12-01"/>
-                    <code code="55186-1" codeSystem="2.16.840.1.113883.6.1" displayName="Measure Section"/>
-                    <title>Measure Section</title>
-                    <text>
-                        <table border="1" width="100%">
-                            <tbody>
-                                <tr>
-                                    <th>Reporting Period: January 01, 2023 - December 31, 2023</th>
-                                </tr>
-                            </tbody>
-                        </table>
-                        <table border="1" width="100%">
-                            <thead>
-                                <tr>
-                                    <th>PI Measure Title</th>
-                                    <th>Measure Identifier</th>
-                                </tr>
-                            </thead>
-                            <tbody>
-                                <tr>
-                                    <td>Query of the Prescription Drug Monitoring Program (PDMP)</td>
-                                    <td>PI_EP_2</td>
-                                </tr>
-                            </tbody>
-                        </table>
-                        <list>
-                            <item>
-                                <content styleCode="Bold">Measure Answer (Yes/No): </content>Yes</item>
-                        </list>
-                        <table border="1" width="100%">
-                            <thead>
-                                <tr>
-                                    <th>PI Measure Title</th>
-                                    <th>Measure Identifier</th>
-                                </tr>
-                            </thead>
-                            <tbody>
-                                <tr>
-                                    <td>e-Prescribing</td>
-                                    <td>PI_EP_1</td>
-                                </tr>
-                            </tbody>
-                        </table>
-                        <list>
-                            <item>
-                                <content styleCode="Bold">Denominator: </content>800</item>
-                            <item>
-                                <content styleCode="Bold">Numerator: </content>750</item>
-                        </list>
-                        <table border="1" width="100%">
-                            <thead>
-                                <tr>
-                                    <th>PI Measure Title</th>
-                                    <th>Measure Identifier</th>
-                                </tr>
-                            </thead>
-                            <tbody>
-                                <tr>
-                                    <td>Provide Patients Electronic Access to their Health Information</td>
-                                    <td>PI_PEA_1</td>
-                                </tr>
-                            </tbody>
-                        </table>
-                        <list>
-                            <item>
-                                <content styleCode="Bold">Denominator: </content>800</item>
-                            <item>
-                                <content styleCode="Bold">Numerator: </content>600</item>
-                        </list>
-                    </text>
-                    <!-- PI_EP_2 which is an example of PI measure with reporting metric of boolean -->
-                    <entry>
-                        <organizer classCode="CLUSTER" moodCode="EVN">
-                            <!-- Implied template Measure Reference templateId -->
-                            <templateId root="2.16.840.1.113883.10.20.24.3.98"/>
-                            <!-- Promoting Interoperability Numerator Measure Performed Measure Reference and Results templateId -->
-                            <templateId root="2.16.840.1.113883.10.20.27.3.29" extension="2016-09-01"/>
-                            <id root="ac575aef-7062-4ea2-b723-df517cfa470a"/>
-                            <statusCode code="completed"/>
-                            <reference typeCode="REFR">
-                                <!-- Reference to a particular PI measure's unique identifier. -->
-                                <externalDocument classCode="DOC" moodCode="EVN">
-                                    <!-- extension is the unique identifier for a PI measure. -->
-                                    <id root="2.16.840.1.113883.3.7031" extension="PI_EP_2"/>
-                                    <!-- PI measure title -->
-                                    <text>Query of the Prescription Drug Monitoring Program (PDMP)</text>
-                                </externalDocument>
-                            </reference>
-                            <component>
-                                <observation classCode="OBS" moodCode="EVN">
-                                    <!-- Measure Performed templateId -->
-                                    <templateId root="2.16.840.1.113883.10.20.27.3.27" extension="2016-09-01"/>
-                                    <code code="ASSERTION" codeSystem="2.16.840.1.113883.5.4"
-                                          codeSystemName="ActCode" displayName="Assertion"/>
-                                    <statusCode code="completed"/>
-                                    <value xsi:type="CD" code="Y" codeSystem="2.16.840.1.113883.12.136"
-                                           codeSystemName="Yes/no indicator (HL7 Table 0136)" displayName="Yes"/>
-                                </observation>
-                            </component>
-                        </organizer>
-                    </entry>
-                    <!-- PI_EP_1 which is an example of PI measure with reporting metric of proportion -->
-                    <entry>
-                        <organizer classCode="CLUSTER" moodCode="EVN">
-                            <!-- Implied template Measure Reference templateId -->
-                            <templateId root="2.16.840.1.113883.10.20.24.3.98"/>
-                            <!-- PI Numerator Denominator Type Measure Reference and Results V2 templateId -->
-                            <templateId root="2.16.840.1.113883.10.20.27.3.28" extension="2017-06-01"/>
-                            <id root="ac575aef-7062-4ea2-b723-df517cfa470a"/>
-                            <statusCode code="completed"/>
-                            <reference typeCode="REFR">
-                                <!-- Reference to a particular PI measure's unique identifier. -->
-                                <externalDocument classCode="DOC" moodCode="EVN">
-                                    <!-- extension is the unique identifier for an PI measure. -->
-                                    <id root="2.16.840.1.113883.3.7031" extension="PI_EP_1"/>
-                                    <!-- PI measure title -->
-                                    <text>e-Prescribing</text>
-                                </externalDocument>
-                            </reference>
-                            <component>
-                                <observation classCode="OBS" moodCode="EVN">
-                                    <!-- PI Numerator Denominator Type Measure Numerator Data templateId -->
-                                    <templateId root="2.16.840.1.113883.10.20.27.3.31" extension="2016-09-01"/>
-                                    <code code="ASSERTION" codeSystem="2.16.840.1.113883.5.4"
-                                          codeSystemName="ActCode" displayName="Assertion"/>
-                                    <statusCode code="completed"/>
-                                    <value xsi:type="CD" code="NUMER" codeSystem="2.16.840.1.113883.5.4"
-                                           codeSystemName="ActCode"/>
-                                    <!-- Numerator Count-->
-                                    <entryRelationship typeCode="SUBJ" inversionInd="true">
-                                        <observation classCode="OBS" moodCode="EVN">
-                                            <templateId root="2.16.840.1.113883.10.20.27.3.3"/>
-                                            <code code="MSRAGG" codeSystem="2.16.840.1.113883.5.4"
-                                                  codeSystemName="ActCode" displayName="rate aggregation"/>
-                                            <value xsi:type="INT" value="750"/>
-                                            <methodCode code="COUNT" codeSystem="2.16.840.1.113883.5.84"
-                                                        codeSystemName="ObservationMethod" displayName="Count"/>
-                                        </observation>
-                                    </entryRelationship>
-                                </observation>
-                            </component>
-                            <component>
-                                <observation classCode="OBS" moodCode="EVN">
-                                    <!-- PI Numerator Denominator Type Measure Denominator Data templateId -->
-                                    <templateId root="2.16.840.1.113883.10.20.27.3.32" extension="2016-09-01"/>
-                                    <code code="ASSERTION" codeSystem="2.16.840.1.113883.5.4"
-                                          codeSystemName="ActCode" displayName="Assertion"/>
-                                    <statusCode code="completed"/>
-                                    <value xsi:type="CD" code="DENOM" codeSystem="2.16.840.1.113883.5.4"
-                                           codeSystemName="ActCode"/>
-                                    <!-- Denominator Count-->
-                                    <entryRelationship typeCode="SUBJ" inversionInd="true">
-                                        <observation classCode="OBS" moodCode="EVN">
-                                            <templateId root="2.16.840.1.113883.10.20.27.3.3"/>
-                                            <code code="MSRAGG" codeSystem="2.16.840.1.113883.5.4"
-                                                  codeSystemName="ActCode" displayName="rate aggregation"/>
-                                            <value xsi:type="INT" value="800"/>
-                                            <methodCode code="COUNT" codeSystem="2.16.840.1.113883.5.84"
-                                                        codeSystemName="ObservationMethod" displayName="Count"/>
-                                        </observation>
-                                    </entryRelationship>
-                                </observation>
-                            </component>
-                        </organizer>
-                    </entry>
-                    <!-- PI_PEA_1 which is an example of a proportion PI measure -->
-                    <entry>
-                        <organizer classCode="CLUSTER" moodCode="EVN">
-                            <!-- Implied template Measure Reference templateId -->
-                            <templateId root="2.16.840.1.113883.10.20.24.3.98"/>
-                            <!-- PI Numerator Denominator Type Measure Reference and Results V2 templateId -->
-                            <templateId root="2.16.840.1.113883.10.20.27.3.28" extension="2017-06-01"/>
-                            <id root="ac575aef-7062-4ea2-b723-df517cfa470a"/>
-                            <statusCode code="completed"/>
-                            <reference typeCode="REFR">
-                                <!-- Reference to a particular PI measure's unique identifier. -->
-                                <externalDocument classCode="DOC" moodCode="EVN">
-                                    <!-- extension is the unique identifier for an PI measure. -->
-                                    <id root="2.16.840.1.113883.3.7031" extension="PI_PEA_1"/>
-                                    <!-- PI measure title -->
-                                    <text>Provide Patients Electronic Access to their Health
-                                        Information</text>
-                                </externalDocument>
-                            </reference>
-                            <component>
-                                <observation classCode="OBS" moodCode="EVN">
-                                    <!-- PI Numerator Denominator Type Measure Numerator Data templateId -->
-                                    <templateId root="2.16.840.1.113883.10.20.27.3.31" extension="2016-09-01"/>
-                                    <code code="ASSERTION" codeSystem="2.16.840.1.113883.5.4"
-                                          codeSystemName="ActCode" displayName="Assertion"/>
-                                    <statusCode code="completed"/>
-                                    <value xsi:type="CD" code="NUMER" codeSystem="2.16.840.1.113883.5.4"
-                                           codeSystemName="ActCode"/>
-                                    <!-- Numerator Count-->
-                                    <entryRelationship typeCode="SUBJ" inversionInd="true">
-                                        <observation classCode="OBS" moodCode="EVN">
-                                            <templateId root="2.16.840.1.113883.10.20.27.3.3"/>
-                                            <code code="MSRAGG" codeSystem="2.16.840.1.113883.5.4"
-                                                  codeSystemName="ActCode" displayName="rate aggregation"/>
-                                            <value xsi:type="INT" value="600"/>
-                                            <methodCode code="COUNT" codeSystem="2.16.840.1.113883.5.84"
-                                                        codeSystemName="ObservationMethod" displayName="Count"/>
-                                        </observation>
-                                    </entryRelationship>
-                                </observation>
-                            </component>
-                            <component>
-                                <observation classCode="OBS" moodCode="EVN">
-                                    <!-- PI Numerator Denominator Type Measure Denominator Data templateId -->
-                                    <templateId root="2.16.840.1.113883.10.20.27.3.32" extension="2016-09-01"/>
-                                    <code code="ASSERTION" codeSystem="2.16.840.1.113883.5.4"
-                                          codeSystemName="ActCode" displayName="Assertion"/>
-                                    <statusCode code="completed"/>
-                                    <value xsi:type="CD" code="DENOM" codeSystem="2.16.840.1.113883.5.4"
-                                           codeSystemName="ActCode"/>
-                                    <!-- Denominator Count-->
-                                    <entryRelationship typeCode="SUBJ" inversionInd="true">
-                                        <observation classCode="OBS" moodCode="EVN">
-                                            <templateId root="2.16.840.1.113883.10.20.27.3.3"/>
-                                            <code code="MSRAGG" codeSystem="2.16.840.1.113883.5.4"
-                                                  codeSystemName="ActCode" displayName="rate aggregation"/>
-                                            <value xsi:type="INT" value="800"/>
-                                            <methodCode code="COUNT" codeSystem="2.16.840.1.113883.5.84"
-                                                        codeSystemName="ObservationMethod" displayName="Count"/>
-                                        </observation>
-                                    </entryRelationship>
-                                </observation>
-                            </component>
-                        </organizer>
-                    </entry>
-                    <!-- Performance Period -->
-                    <entry typeCode="DRIV">
-                        <act classCode="ACT" moodCode="EVN">
-                            <!-- Reporting Parameters Act (V2) -->
-                            <templateId root="2.16.840.1.113883.10.20.17.3.8" extension="2020-12-01"/>
-                            <id root="95944FB8-241B-11E5-1027-09173F13E4C5"/>
-                            <code code="252116004" codeSystem="2.16.840.1.113883.6.96"
-                                  displayName="Observation Parameters"/>
-                            <effectiveTime>
-                                <low value="20250101"/>
-                                <high value="20251231"/>
-                            </effectiveTime>
-                        </act>
-                    </entry>
-                </section>
-            </component>
-        </structuredBody>
-    </component>
-</ClinicalDocument>
diff --git a/converter/src/test/resources/ssp/2025/ssp-Indv-QRDA-III.xml b/converter/src/test/resources/ssp/2025/ssp-Indv-QRDA-III.xml
deleted file mode 100644
index b0ef4e2bd..000000000
--- a/converter/src/test/resources/ssp/2025/ssp-Indv-QRDA-III.xml
+++ /dev/null
@@ -1,395 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?xml-stylesheet type="text/xsl" href="qrda.xsl"?>
-<ClinicalDocument xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                  xsi:schemaLocation="urn:hl7-org:v3 ../CDA_Schema_Files/infrastructure/cda/CDA_SDTC.xsd"
-                  xmlns="urn:hl7-org:v3" xmlns:voc="urn:hl7-org:v3/voc">
-    <!--
-********************************************************
-CDA Header
-********************************************************
--->
-    <realmCode code="US"/>
-    <typeId root="2.16.840.1.113883.1.3" extension="POCD_HD000040"/>
-    <templateId root="2.16.840.1.113883.10.20.27.1.1" extension="2017-06-01"/>
-    <templateId root="2.16.840.1.113883.10.20.27.1.2" extension="2024-12-01"/>
-    <id root="26a42253-99f5-48e7-9274-b467c6c7f623"/>
-    <code code="55184-6" codeSystem="2.16.840.1.113883.6.1" codeSystemName="LOINC"
-          displayName="Quality Reporting Document Architecture Calculated Summary Report"/>
-    <title>2017 Eligible Clinicians (EC) and Eligible Professionals (EP) Sample QRDA-III</title>
-    <effectiveTime value="20170311061231"/>
-    <confidentialityCode codeSystem="2.16.840.1.113883.5.25" code="N"/>
-    <languageCode code="en"/>
-    <setId root="ae23711d-783d-4f5e-b942-4084b467848b"/>
-    <versionNumber value="1"/>
-    <recordTarget>
-        <patientRole>
-            <id nullFlavor="NA"/>
-        </patientRole>
-    </recordTarget>
-    <author>
-        <time value="20170131061231"/>
-        <assignedAuthor>
-            <id root="3d0a32f3-5164-4a6f-8922-de3badf83de4"/>
-            <assignedAuthoringDevice>
-                <softwareName>SOME Data Aggregator Transform Tool AS00016dev</softwareName>
-            </assignedAuthoringDevice>
-            <representedOrganization>
-                <id root="2.16.840.1.113883.19.5" extension="223344"/>
-                <name>Good Health Clinic</name>
-            </representedOrganization>
-        </assignedAuthor>
-    </author>
-    <author>
-        <time value="20170131114411"/>
-        <assignedAuthor>
-            <id root="2.16.840.1.113883.4.6" extension="1234567893" assigningAuthorityName="NPI"/>
-            <assignedPerson>
-                <name>
-                    <given>Trevor</given>
-                    <family>Philips</family>
-                </name>
-            </assignedPerson>
-            <representedOrganization>
-                <id root="2.16.840.1.113883.19.5" extension="223344"/>
-                <name>Good Health Clinic</name>
-            </representedOrganization>
-        </assignedAuthor>
-    </author>
-    <custodian>
-        <assignedCustodian>
-            <representedCustodianOrganization>
-                <id root="2.16.840.1.113883.19.5" extension="223344"/>
-                <name>Good Health Clinic</name>
-            </representedCustodianOrganization>
-        </assignedCustodian>
-    </custodian>
-    <informationRecipient>
-        <intendedRecipient>
-            <id root="2.16.840.1.113883.3.249.7" extension="SSP_PI_INDIV"/>
-        </intendedRecipient>
-    </informationRecipient>
-    <legalAuthenticator>
-        <time value="20170312153222"/>
-        <signatureCode code="S"/>
-        <assignedEntity>
-            <id root="bc01a5d1-3a34-4286-82cc-43eb04c972a7"/>
-            <representedOrganization>
-                <id root="2.16.840.1.113883.19.5" extension="223344"/>
-                <name>Good Health Clinic</name>
-            </representedOrganization>
-        </assignedEntity>
-    </legalAuthenticator>
-    <participant typeCode="DEV">
-        <associatedEntity classCode="RGPR">
-            <id root="2.16.840.1.113883.3.2074.1" extension="XX15CXXXXXXXXXX" />
-            <code code="129465004" displayName="medical record, device" codeSystem="2.16.840.1.113883.6.96" codeSystemName="SNOMED-CT" />
-        </associatedEntity>
-    </participant>
-    <documentationOf typeCode="DOC">
-        <serviceEvent classCode="PCPR">
-            <effectiveTime>
-                <low value="20170101"/>
-                <high value="20171231"/>
-            </effectiveTime>
-            <performer typeCode="PRF">
-                <time>
-                    <low value="20170101"/>
-                    <high value="20171231"/>
-                </time>
-                <assignedEntity>
-                    <representedOrganization>
-                        <id root="2.16.840.1.113883.3.249.5.4" extension="MIPS1001"/>
-                        <name>Good Health Clinic</name>
-                    </representedOrganization>
-                </assignedEntity>
-            </performer>
-            <performer>
-                <time>
-                    <low value="20250101"/>
-                    <high value="20251231"/>
-                </time>
-                <assignedEntity>
-                    <id root="2.16.840.1.113883.4.6" extension="2567891421"/>
-                    <representedOrganization>
-                        <id root="2.16.840.1.113883.4.2" extension="990000099"/>
-                        <name>Good Healthcare Practice</name>
-                    </representedOrganization>
-                </assignedEntity>
-            </performer>
-        </serviceEvent>
-    </documentationOf>
-    <authorization>
-        <consent>
-            <id root="da2c8a32-d76b-4c37-a1f4-137485387650"/>
-            <code code="425691002" displayName="consent given for electronic record sharing"
-                  codeSystem="2.16.840.1.113883.6.96" codeSystemName="SNOMED-CT"/>
-            <statusCode code="completed"/>
-        </consent>
-    </authorization>
-    <!--
-    ********************************************************
-    CDA Body
-    ********************************************************
-    -->
-    <component>
-        <structuredBody>
-            <!--
-              ********************************************************
-              Promoting Interoperability Section (V3)
-              urn:hl7ii:2.16.840.1.113883.10.20.27.2.5:2020-12-01
-              ********************************************************
-              -->
-            <component>
-                <section>
-                    <!-- Measure Section -->
-                    <templateId root="2.16.840.1.113883.10.20.24.2.2"/>
-                    <!-- Promoting Interoperability Information Section (V3) templateId -->
-                    <templateId root="2.16.840.1.113883.10.20.27.2.5" extension="2020-12-01"/>
-                    <code code="55186-1" codeSystem="2.16.840.1.113883.6.1" displayName="Measure Section"/>
-                    <title>Measure Section</title>
-                    <text>
-                        <table border="1" width="100%">
-                            <tbody>
-                                <tr>
-                                    <th>Reporting Period: January 01, 2023 - December 31, 2023</th>
-                                </tr>
-                            </tbody>
-                        </table>
-                        <table border="1" width="100%">
-                            <thead>
-                                <tr>
-                                    <th>PI Measure Title</th>
-                                    <th>Measure Identifier</th>
-                                </tr>
-                            </thead>
-                            <tbody>
-                                <tr>
-                                    <td>Query of the Prescription Drug Monitoring Program (PDMP)</td>
-                                    <td>PI_EP_2</td>
-                                </tr>
-                            </tbody>
-                        </table>
-                        <list>
-                            <item>
-                                <content styleCode="Bold">Measure Answer (Yes/No): </content>Yes</item>
-                        </list>
-                        <table border="1" width="100%">
-                            <thead>
-                                <tr>
-                                    <th>PI Measure Title</th>
-                                    <th>Measure Identifier</th>
-                                </tr>
-                            </thead>
-                            <tbody>
-                                <tr>
-                                    <td>e-Prescribing</td>
-                                    <td>PI_EP_1</td>
-                                </tr>
-                            </tbody>
-                        </table>
-                        <list>
-                            <item>
-                                <content styleCode="Bold">Denominator: </content>800</item>
-                            <item>
-                                <content styleCode="Bold">Numerator: </content>750</item>
-                        </list>
-                        <table border="1" width="100%">
-                            <thead>
-                                <tr>
-                                    <th>PI Measure Title</th>
-                                    <th>Measure Identifier</th>
-                                </tr>
-                            </thead>
-                            <tbody>
-                                <tr>
-                                    <td>Provide Patients Electronic Access to their Health Information</td>
-                                    <td>PI_PEA_1</td>
-                                </tr>
-                            </tbody>
-                        </table>
-                        <list>
-                            <item>
-                                <content styleCode="Bold">Denominator: </content>800</item>
-                            <item>
-                                <content styleCode="Bold">Numerator: </content>600</item>
-                        </list>
-                    </text>
-                    <!-- PI_EP_2 which is an example of PI measure with reporting metric of boolean -->
-                    <entry>
-                        <organizer classCode="CLUSTER" moodCode="EVN">
-                            <!-- Implied template Measure Reference templateId -->
-                            <templateId root="2.16.840.1.113883.10.20.24.3.98"/>
-                            <!-- Promoting Interoperability Numerator Measure Performed Measure Reference and Results templateId -->
-                            <templateId root="2.16.840.1.113883.10.20.27.3.29" extension="2016-09-01"/>
-                            <id root="ac575aef-7062-4ea2-b723-df517cfa470a"/>
-                            <statusCode code="completed"/>
-                            <reference typeCode="REFR">
-                                <!-- Reference to a particular PI measure's unique identifier. -->
-                                <externalDocument classCode="DOC" moodCode="EVN">
-                                    <!-- extension is the unique identifier for a PI measure. -->
-                                    <id root="2.16.840.1.113883.3.7031" extension="PI_EP_2"/>
-                                    <!-- PI measure title -->
-                                    <text>Query of the Prescription Drug Monitoring Program (PDMP)</text>
-                                </externalDocument>
-                            </reference>
-                            <component>
-                                <observation classCode="OBS" moodCode="EVN">
-                                    <!-- Measure Performed templateId -->
-                                    <templateId root="2.16.840.1.113883.10.20.27.3.27" extension="2016-09-01"/>
-                                    <code code="ASSERTION" codeSystem="2.16.840.1.113883.5.4"
-                                          codeSystemName="ActCode" displayName="Assertion"/>
-                                    <statusCode code="completed"/>
-                                    <value xsi:type="CD" code="Y" codeSystem="2.16.840.1.113883.12.136"
-                                           codeSystemName="Yes/no indicator (HL7 Table 0136)" displayName="Yes"/>
-                                </observation>
-                            </component>
-                        </organizer>
-                    </entry>
-                    <!-- PI_EP_1 which is an example of PI measure with reporting metric of proportion -->
-                    <entry>
-                        <organizer classCode="CLUSTER" moodCode="EVN">
-                            <!-- Implied template Measure Reference templateId -->
-                            <templateId root="2.16.840.1.113883.10.20.24.3.98"/>
-                            <!-- PI Numerator Denominator Type Measure Reference and Results V2 templateId -->
-                            <templateId root="2.16.840.1.113883.10.20.27.3.28" extension="2017-06-01"/>
-                            <id root="ac575aef-7062-4ea2-b723-df517cfa470a"/>
-                            <statusCode code="completed"/>
-                            <reference typeCode="REFR">
-                                <!-- Reference to a particular PI measure's unique identifier. -->
-                                <externalDocument classCode="DOC" moodCode="EVN">
-                                    <!-- extension is the unique identifier for an PI measure. -->
-                                    <id root="2.16.840.1.113883.3.7031" extension="PI_EP_1"/>
-                                    <!-- PI measure title -->
-                                    <text>e-Prescribing</text>
-                                </externalDocument>
-                            </reference>
-                            <component>
-                                <observation classCode="OBS" moodCode="EVN">
-                                    <!-- PI Numerator Denominator Type Measure Numerator Data templateId -->
-                                    <templateId root="2.16.840.1.113883.10.20.27.3.31" extension="2016-09-01"/>
-                                    <code code="ASSERTION" codeSystem="2.16.840.1.113883.5.4"
-                                          codeSystemName="ActCode" displayName="Assertion"/>
-                                    <statusCode code="completed"/>
-                                    <value xsi:type="CD" code="NUMER" codeSystem="2.16.840.1.113883.5.4"
-                                           codeSystemName="ActCode"/>
-                                    <!-- Numerator Count-->
-                                    <entryRelationship typeCode="SUBJ" inversionInd="true">
-                                        <observation classCode="OBS" moodCode="EVN">
-                                            <templateId root="2.16.840.1.113883.10.20.27.3.3"/>
-                                            <code code="MSRAGG" codeSystem="2.16.840.1.113883.5.4"
-                                                  codeSystemName="ActCode" displayName="rate aggregation"/>
-                                            <value xsi:type="INT" value="750"/>
-                                            <methodCode code="COUNT" codeSystem="2.16.840.1.113883.5.84"
-                                                        codeSystemName="ObservationMethod" displayName="Count"/>
-                                        </observation>
-                                    </entryRelationship>
-                                </observation>
-                            </component>
-                            <component>
-                                <observation classCode="OBS" moodCode="EVN">
-                                    <!-- PI Numerator Denominator Type Measure Denominator Data templateId -->
-                                    <templateId root="2.16.840.1.113883.10.20.27.3.32" extension="2016-09-01"/>
-                                    <code code="ASSERTION" codeSystem="2.16.840.1.113883.5.4"
-                                          codeSystemName="ActCode" displayName="Assertion"/>
-                                    <statusCode code="completed"/>
-                                    <value xsi:type="CD" code="DENOM" codeSystem="2.16.840.1.113883.5.4"
-                                           codeSystemName="ActCode"/>
-                                    <!-- Denominator Count-->
-                                    <entryRelationship typeCode="SUBJ" inversionInd="true">
-                                        <observation classCode="OBS" moodCode="EVN">
-                                            <templateId root="2.16.840.1.113883.10.20.27.3.3"/>
-                                            <code code="MSRAGG" codeSystem="2.16.840.1.113883.5.4"
-                                                  codeSystemName="ActCode" displayName="rate aggregation"/>
-                                            <value xsi:type="INT" value="800"/>
-                                            <methodCode code="COUNT" codeSystem="2.16.840.1.113883.5.84"
-                                                        codeSystemName="ObservationMethod" displayName="Count"/>
-                                        </observation>
-                                    </entryRelationship>
-                                </observation>
-                            </component>
-                        </organizer>
-                    </entry>
-                    <!-- PI_PEA_1 which is an example of a proportion PI measure -->
-                    <entry>
-                        <organizer classCode="CLUSTER" moodCode="EVN">
-                            <!-- Implied template Measure Reference templateId -->
-                            <templateId root="2.16.840.1.113883.10.20.24.3.98"/>
-                            <!-- PI Numerator Denominator Type Measure Reference and Results V2 templateId -->
-                            <templateId root="2.16.840.1.113883.10.20.27.3.28" extension="2017-06-01"/>
-                            <id root="ac575aef-7062-4ea2-b723-df517cfa470a"/>
-                            <statusCode code="completed"/>
-                            <reference typeCode="REFR">
-                                <!-- Reference to a particular PI measure's unique identifier. -->
-                                <externalDocument classCode="DOC" moodCode="EVN">
-                                    <!-- extension is the unique identifier for an PI measure. -->
-                                    <id root="2.16.840.1.113883.3.7031" extension="PI_PEA_1"/>
-                                    <!-- PI measure title -->
-                                    <text>Provide Patients Electronic Access to their Health
-                                        Information</text>
-                                </externalDocument>
-                            </reference>
-                            <component>
-                                <observation classCode="OBS" moodCode="EVN">
-                                    <!-- PI Numerator Denominator Type Measure Numerator Data templateId -->
-                                    <templateId root="2.16.840.1.113883.10.20.27.3.31" extension="2016-09-01"/>
-                                    <code code="ASSERTION" codeSystem="2.16.840.1.113883.5.4"
-                                          codeSystemName="ActCode" displayName="Assertion"/>
-                                    <statusCode code="completed"/>
-                                    <value xsi:type="CD" code="NUMER" codeSystem="2.16.840.1.113883.5.4"
-                                           codeSystemName="ActCode"/>
-                                    <!-- Numerator Count-->
-                                    <entryRelationship typeCode="SUBJ" inversionInd="true">
-                                        <observation classCode="OBS" moodCode="EVN">
-                                            <templateId root="2.16.840.1.113883.10.20.27.3.3"/>
-                                            <code code="MSRAGG" codeSystem="2.16.840.1.113883.5.4"
-                                                  codeSystemName="ActCode" displayName="rate aggregation"/>
-                                            <value xsi:type="INT" value="600"/>
-                                            <methodCode code="COUNT" codeSystem="2.16.840.1.113883.5.84"
-                                                        codeSystemName="ObservationMethod" displayName="Count"/>
-                                        </observation>
-                                    </entryRelationship>
-                                </observation>
-                            </component>
-                            <component>
-                                <observation classCode="OBS" moodCode="EVN">
-                                    <!-- PI Numerator Denominator Type Measure Denominator Data templateId -->
-                                    <templateId root="2.16.840.1.113883.10.20.27.3.32" extension="2016-09-01"/>
-                                    <code code="ASSERTION" codeSystem="2.16.840.1.113883.5.4"
-                                          codeSystemName="ActCode" displayName="Assertion"/>
-                                    <statusCode code="completed"/>
-                                    <value xsi:type="CD" code="DENOM" codeSystem="2.16.840.1.113883.5.4"
-                                           codeSystemName="ActCode"/>
-                                    <!-- Denominator Count-->
-                                    <entryRelationship typeCode="SUBJ" inversionInd="true">
-                                        <observation classCode="OBS" moodCode="EVN">
-                                            <templateId root="2.16.840.1.113883.10.20.27.3.3"/>
-                                            <code code="MSRAGG" codeSystem="2.16.840.1.113883.5.4"
-                                                  codeSystemName="ActCode" displayName="rate aggregation"/>
-                                            <value xsi:type="INT" value="800"/>
-                                            <methodCode code="COUNT" codeSystem="2.16.840.1.113883.5.84"
-                                                        codeSystemName="ObservationMethod" displayName="Count"/>
-                                        </observation>
-                                    </entryRelationship>
-                                </observation>
-                            </component>
-                        </organizer>
-                    </entry>
-                    <!-- Performance Period -->
-                    <entry typeCode="DRIV">
-                        <act classCode="ACT" moodCode="EVN">
-                            <!-- Reporting Parameters Act (V2) -->
-                            <templateId root="2.16.840.1.113883.10.20.17.3.8" extension="2020-12-01"/>
-                            <id root="95944FB8-241B-11E5-1027-09173F13E4C5"/>
-                            <code code="252116004" codeSystem="2.16.840.1.113883.6.96"
-                                  displayName="Observation Parameters"/>
-                            <effectiveTime>
-                                <low value="20250101"/>
-                                <high value="20251231"/>
-                            </effectiveTime>
-                        </act>
-                    </entry>
-                </section>
-            </component>
-        </structuredBody>
-    </component>
-</ClinicalDocument>
diff --git a/generate-race-cpcplus/pom.xml b/generate-race-cpcplus/pom.xml
index 2b5143175..8af379ca9 100644
--- a/generate-race-cpcplus/pom.xml
+++ b/generate-race-cpcplus/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>qpp-conversion-tool-parent</artifactId>
 		<groupId>gov.cms.qpp.conversion</groupId>
-		<version>2025.11.19.01-RELEASE</version>
+		<version>2025.12.16.01-RELEASE</version>
 		<relativePath>../</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
diff --git a/generate/pom.xml b/generate/pom.xml
index 9796df48c..7438084e5 100644
--- a/generate/pom.xml
+++ b/generate/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>qpp-conversion-tool-parent</artifactId>
 		<groupId>gov.cms.qpp.conversion</groupId>
-		<version>2025.11.19.01-RELEASE</version>
+		<version>2025.12.16.01-RELEASE</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index 66597ace4..628e45729 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 	<groupId>gov.cms.qpp.conversion</groupId>
 	<artifactId>qpp-conversion-tool-parent</artifactId>
 	<packaging>pom</packaging>
-	<version>2025.11.19.01-RELEASE</version>
+	<version>2025.12.16.01-RELEASE</version>
 	<name>QPP Conversion Tool</name>
 
 	<properties>
diff --git a/qrda3-update-measures/pom.xml b/qrda3-update-measures/pom.xml
index 51bbbe68b..c3bdb0d3a 100644
--- a/qrda3-update-measures/pom.xml
+++ b/qrda3-update-measures/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>qpp-conversion-tool-parent</artifactId>
 		<groupId>gov.cms.qpp.conversion</groupId>
-		<version>2025.11.19.01-RELEASE</version>
+		<version>2025.12.16.01-RELEASE</version>
 		<relativePath>../</relativePath>
 	</parent>
 
diff --git a/rest-api/pom.xml b/rest-api/pom.xml
index c79491f6a..775fbf03f 100644
--- a/rest-api/pom.xml
+++ b/rest-api/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>gov.cms.qpp.conversion</groupId>
         <artifactId>qpp-conversion-tool-parent</artifactId>
-        <version>2025.11.19.01-RELEASE</version>
+        <version>2025.12.16.01-RELEASE</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/test-commons/pom.xml b/test-commons/pom.xml
index e1629b559..dd0ae2372 100644
--- a/test-commons/pom.xml
+++ b/test-commons/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>gov.cms.qpp.conversion</groupId>
 		<artifactId>qpp-conversion-tool-parent</artifactId>
-		<version>2025.11.19.01-RELEASE</version>
+		<version>2025.12.16.01-RELEASE</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/test-coverage/pom.xml b/test-coverage/pom.xml
index b414ea9ca..2c5689734 100644
--- a/test-coverage/pom.xml
+++ b/test-coverage/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>gov.cms.qpp.conversion</groupId>
 		<artifactId>qpp-conversion-tool-parent</artifactId>
-		<version>2025.11.19.01-RELEASE</version>
+		<version>2025.12.16.01-RELEASE</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>