diff --git a/CHANGELOG.md b/CHANGELOG.md
index 72e9ba013..3201d23bd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * The GP2GP Adaptor now populates the ObservationStatement / confidentialityCode field when the .meta.security field of an Uncategorized Data Observation contains NOPAT
 * When List.meta.security field contains NOPAT, the GP2GP Adaptor will now populate the CompoundStatement.confidentialityCode
 * The GP2GP Adaptor now throws an exception when the Access Structure Record is empty, thereby rejecting the transfer
+* The GP2GP Adaptor now throws an exception when the XML is not valid, thereby stopping the transfer from going forward
 
 ### Fixed
 * When DiagnosticReport doesn't contain a Specimen or Observation reference, instead of "DUMMY" "NOT-PRESENT" value is used
diff --git a/service/src/main/java/uk/nhs/adaptors/gp2gp/ehr/exception/XmlSchemaValidationException.java b/service/src/main/java/uk/nhs/adaptors/gp2gp/ehr/exception/XmlSchemaValidationException.java
new file mode 100644
index 000000000..b336865d8
--- /dev/null
+++ b/service/src/main/java/uk/nhs/adaptors/gp2gp/ehr/exception/XmlSchemaValidationException.java
@@ -0,0 +1,8 @@
+package uk.nhs.adaptors.gp2gp.ehr.exception;
+
+public class XmlSchemaValidationException extends RuntimeException {
+
+    public XmlSchemaValidationException(String message, Throwable cause) {
+        super(message, cause);
+    }
+}
\ No newline at end of file
diff --git a/service/src/main/java/uk/nhs/adaptors/gp2gp/ehr/mapper/EhrExtractMapper.java b/service/src/main/java/uk/nhs/adaptors/gp2gp/ehr/mapper/EhrExtractMapper.java
index 5736798a3..cf538dc70 100644
--- a/service/src/main/java/uk/nhs/adaptors/gp2gp/ehr/mapper/EhrExtractMapper.java
+++ b/service/src/main/java/uk/nhs/adaptors/gp2gp/ehr/mapper/EhrExtractMapper.java
@@ -11,8 +11,10 @@
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
+import uk.nhs.adaptors.gp2gp.common.configuration.RedactionsContext;
 import uk.nhs.adaptors.gp2gp.common.service.RandomIdGeneratorService;
 import uk.nhs.adaptors.gp2gp.common.service.TimestampService;
+import uk.nhs.adaptors.gp2gp.ehr.exception.XmlSchemaValidationException;
 import uk.nhs.adaptors.gp2gp.ehr.mapper.parameters.EhrExtractTemplateParameters;
 import uk.nhs.adaptors.gp2gp.ehr.mapper.parameters.SkeletonComponentTemplateParameters;
 import uk.nhs.adaptors.gp2gp.ehr.utils.DateFormatUtil;
@@ -23,6 +25,15 @@
 
 import uk.nhs.adaptors.gp2gp.ehr.exception.EhrValidationException;
 
+import javax.xml.validation.Schema;
+import javax.xml.validation.SchemaFactory;
+import javax.xml.validation.Validator;
+import javax.xml.transform.stream.StreamSource;
+import org.xml.sax.SAXException;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.StringReader;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
@@ -31,9 +42,14 @@
 @Component
 @Slf4j
 public class EhrExtractMapper {
+    private final RedactionsContext redactionsContext;
     private static final Mustache EHR_EXTRACT_TEMPLATE = TemplateUtils.loadTemplate("ehr_extract_template.mustache");
     private static final Mustache SKELETON_COMPONENT_TEMPLATE = TemplateUtils.loadTemplate("ehr_skeleton_component_template.mustache");
     private static final String CONSULTATION_LIST_CODE = "325851000000107";
+    private static final String SCHEMA_PATH = "../service/src/test/resources/mim/Schemas/";
+
+    private static final String RCMR_IN030000UK06_SCHEMA_PATH =  SCHEMA_PATH + RedactionsContext.NON_REDACTION_INTERACTION_ID + ".xsd";
+    private static final String RCMR_IN030000UK07_SCHEMA_PATH =  SCHEMA_PATH + RedactionsContext.REDACTION_INTERACTION_ID + ".xsd";
 
     private final RandomIdGeneratorService randomIdGeneratorService;
     private final TimestampService timestampService;
@@ -49,6 +65,25 @@ public String mapEhrExtractToXml(EhrExtractTemplateParameters ehrExtractTemplate
         return TemplateUtils.fillTemplate(EHR_EXTRACT_TEMPLATE, ehrExtractTemplateParameters);
     }
 
+    public void validateXmlAgainstSchema(String xml) {
+        String interactionId = redactionsContext.ehrExtractInteractionId();
+        boolean isRedactionInteraction = RedactionsContext.REDACTION_INTERACTION_ID.equals(interactionId);
+
+        String schemaPath = isRedactionInteraction ? RCMR_IN030000UK07_SCHEMA_PATH : RCMR_IN030000UK06_SCHEMA_PATH;
+        try {
+            SchemaFactory factory = SchemaFactory.newDefaultInstance();
+            Schema schema = factory.newSchema(new File(schemaPath));
+            Validator validator = schema.newValidator();
+
+            validator.validate(new StreamSource(new StringReader(xml)));
+
+            LOGGER.info("XML successfully validated against schema: {}", schemaPath);
+        } catch (SAXException | IOException e) {
+            LOGGER.error("XML validation failed against schema {}: {}", schemaPath, e.getMessage(), e);
+            throw new XmlSchemaValidationException("XML schema validation failed", e);
+        }
+    }
+
     public EhrExtractTemplateParameters mapBundleToEhrFhirExtractParams(
             GetGpcStructuredTaskDefinition getGpcStructuredTaskDefinition, Bundle bundle) {
         var ehrExtractTemplateParameters = setSharedExtractParams(getGpcStructuredTaskDefinition);
diff --git a/service/src/main/java/uk/nhs/adaptors/gp2gp/gpc/StructuredRecordMappingService.java b/service/src/main/java/uk/nhs/adaptors/gp2gp/gpc/StructuredRecordMappingService.java
index 0a3ec0540..aa794d8c3 100644
--- a/service/src/main/java/uk/nhs/adaptors/gp2gp/gpc/StructuredRecordMappingService.java
+++ b/service/src/main/java/uk/nhs/adaptors/gp2gp/gpc/StructuredRecordMappingService.java
@@ -20,6 +20,7 @@
 import uk.nhs.adaptors.gp2gp.common.configuration.Gp2gpConfiguration;
 import uk.nhs.adaptors.gp2gp.common.service.RandomIdGeneratorService;
 import uk.nhs.adaptors.gp2gp.ehr.EhrExtractStatusService;
+import uk.nhs.adaptors.gp2gp.ehr.exception.XmlSchemaValidationException;
 import uk.nhs.adaptors.gp2gp.ehr.mapper.EhrExtractMapper;
 import uk.nhs.adaptors.gp2gp.ehr.mapper.MessageContext;
 import uk.nhs.adaptors.gp2gp.ehr.mapper.OutputMessageWrapperMapper;
@@ -151,6 +152,12 @@ public String mapStructuredRecordToEhrExtractXml(GetGpcStructuredTaskDefinition
                 .mapBundleToEhrFhirExtractParams(structuredTaskDefinition, bundle);
         String ehrExtractContent = ehrExtractMapper.mapEhrExtractToXml(ehrExtractTemplateParameters);
 
+        try {
+            ehrExtractMapper.validateXmlAgainstSchema(ehrExtractContent);
+        } catch (XmlSchemaValidationException e) {
+            LOGGER.error("EHR Extract XML validation failed: {}", e.getMessage());
+        }
+
         ehrExtractStatusService.saveEhrExtractMessageId(structuredTaskDefinition.getConversationId(),
                 ehrExtractTemplateParameters.getEhrExtractId());
 
@@ -206,4 +213,4 @@ private static Node removeComponentsFromEhrFolder(Document document) throws XPat
 
         return parent;
     }
-}
+}
\ No newline at end of file
diff --git a/service/src/test/java/uk/nhs/adaptors/gp2gp/ehr/mapper/EhrExtractMapperComponentTest.java b/service/src/test/java/uk/nhs/adaptors/gp2gp/ehr/mapper/EhrExtractMapperComponentTest.java
index cf33f7003..bdade4435 100644
--- a/service/src/test/java/uk/nhs/adaptors/gp2gp/ehr/mapper/EhrExtractMapperComponentTest.java
+++ b/service/src/test/java/uk/nhs/adaptors/gp2gp/ehr/mapper/EhrExtractMapperComponentTest.java
@@ -16,6 +16,7 @@
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.mockito.junit.jupiter.MockitoSettings;
 import org.mockito.quality.Strictness;
+import uk.nhs.adaptors.gp2gp.common.configuration.RedactionsContext;
 import uk.nhs.adaptors.gp2gp.common.service.ConfidentialityService;
 import uk.nhs.adaptors.gp2gp.common.service.FhirParseService;
 import uk.nhs.adaptors.gp2gp.common.service.RandomIdGeneratorService;
@@ -101,6 +102,8 @@ class EhrExtractMapperComponentTest {
     private CodeableConceptCdMapper codeableConceptCdMapper;
     @Mock
     private ConfidentialityService confidentialityService;
+    @Mock
+    private RedactionsContext redactionsContext;
 
     private NonConsultationResourceMapper nonConsultationResourceMapper;
     private EhrExtractMapper ehrExtractMapper;
@@ -218,7 +221,7 @@ codeableConceptCdMapper, new ParticipantMapper(), confidentialityService),
             new BloodPressureValidator()
         );
 
-        ehrExtractMapper = new EhrExtractMapper(randomIdGeneratorService,
+        ehrExtractMapper = new EhrExtractMapper(redactionsContext, randomIdGeneratorService,
             timestampService,
             new EncounterMapper(messageContext, encounterComponentsMapper, confidentialityService),
             nonConsultationResourceMapper,
diff --git a/service/src/test/java/uk/nhs/adaptors/gp2gp/ehr/mapper/EhrExtractMapperTest.java b/service/src/test/java/uk/nhs/adaptors/gp2gp/ehr/mapper/EhrExtractMapperTest.java
index 013cafff5..7b9ce16d5 100644
--- a/service/src/test/java/uk/nhs/adaptors/gp2gp/ehr/mapper/EhrExtractMapperTest.java
+++ b/service/src/test/java/uk/nhs/adaptors/gp2gp/ehr/mapper/EhrExtractMapperTest.java
@@ -1,6 +1,7 @@
 package uk.nhs.adaptors.gp2gp.ehr.mapper;
 
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -8,12 +9,15 @@
 import static org.mockito.Mockito.mock;
 
 
+import java.nio.file.Files;
+import java.nio.file.Paths;
 import java.time.Instant;
 import java.time.temporal.ChronoUnit;
 import java.util.Arrays;
 import java.util.Collections;
 
 import org.hl7.fhir.dstu3.model.Bundle;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
@@ -21,9 +25,11 @@
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.test.util.ReflectionTestUtils;
 
+import uk.nhs.adaptors.gp2gp.common.configuration.RedactionsContext;
 import uk.nhs.adaptors.gp2gp.common.service.RandomIdGeneratorService;
 import uk.nhs.adaptors.gp2gp.common.service.TimestampService;
 import uk.nhs.adaptors.gp2gp.ehr.exception.EhrValidationException;
+import uk.nhs.adaptors.gp2gp.ehr.exception.XmlSchemaValidationException;
 import uk.nhs.adaptors.gp2gp.gpc.GetGpcStructuredTaskDefinition;
 
 @ExtendWith(MockitoExtension.class)
@@ -52,6 +58,8 @@ class EhrExtractMapperTest {
     private EhrFolderEffectiveTime ehrFolderEffectiveTime;
     @InjectMocks
     private EhrExtractMapper ehrExtractMapper;
+    @Mock
+    private RedactionsContext redactionsContext;
 
     @Test
     void When_NhsOverrideNumberProvided_Expect_OverrideToBeUsed()  {
@@ -155,4 +163,48 @@ void When_BuildEhrCompositionForSkeletonEhrExtract_Expect_ExpectedComponentBuilt
 
         assertThat(actual).isEqualTo(expected);
     }
+
+    @Test
+    void When_ValidateXmlAgainstSchemaWithInvalidXmlAndAnyId_Expect_XmlSchemaValidationExceptionIsThrown() {
+        String invalidXml = "<invalid><xml>";
+
+        when(redactionsContext.ehrExtractInteractionId())
+                .thenReturn(RedactionsContext.REDACTION_INTERACTION_ID);
+
+        XmlSchemaValidationException ex = assertThrows(XmlSchemaValidationException.class, () -> {
+            ehrExtractMapper.validateXmlAgainstSchema(invalidXml);
+        });
+
+        assertThat(ex.getMessage()).contains("XML schema validation failed");
+    }
+
+    @Test
+    void When_ValidateXmlAgainstSchemaWithValidXmlAndRedactionId_Expect_NoExceptionIsThrown() throws Exception {
+        String basePath = Paths.get("src/").toFile().getAbsoluteFile().getAbsolutePath()
+                + "/../../service/src/test/resources/";
+        String xmlFilePath = basePath + "complete-and-validated-xml-test-file-redaction.xml";
+
+        String validXml = Files.readString(Paths.get(xmlFilePath));
+
+        when(redactionsContext.ehrExtractInteractionId())
+                .thenReturn(RedactionsContext.REDACTION_INTERACTION_ID);
+        Assertions.assertTrue(validXml.contains("RCMR_IN030000UK07"));
+
+        assertDoesNotThrow(() -> ehrExtractMapper.validateXmlAgainstSchema(validXml));
+    }
+    @Test
+    void When_ValidateXmlAgainstSchemaWithValidXmlAndNonRedactionId_Expect_NoExceptionIsThrown() throws Exception {
+        String basePath = Paths.get("src/").toFile().getAbsoluteFile().getAbsolutePath()
+                + "/../../service/src/test/resources/";
+        String xmlFilePath = basePath + "complete-and-validated-xml-test-file-non-redaction.xml";
+
+        String validXml = Files.readString(Paths.get(xmlFilePath));
+
+        Assertions.assertTrue(validXml.contains("RCMR_IN030000UK06"));
+
+        when(redactionsContext.ehrExtractInteractionId())
+                .thenReturn("interaction_id_test");
+
+        assertDoesNotThrow(() -> ehrExtractMapper.validateXmlAgainstSchema(validXml));
+    }
 }
diff --git a/service/src/test/java/uk/nhs/adaptors/gp2gp/gpc/StructuredRecordMappingServiceTest.java b/service/src/test/java/uk/nhs/adaptors/gp2gp/gpc/StructuredRecordMappingServiceTest.java
index 1a990d6ce..d9d2b2d4a 100644
--- a/service/src/test/java/uk/nhs/adaptors/gp2gp/gpc/StructuredRecordMappingServiceTest.java
+++ b/service/src/test/java/uk/nhs/adaptors/gp2gp/gpc/StructuredRecordMappingServiceTest.java
@@ -3,11 +3,12 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyString;
+
 import static org.mockito.Mockito.lenient;
+import static org.mockito.Mockito.when;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
 import static uk.nhs.adaptors.gp2gp.utils.IdUtil.buildIdType;
 
 import java.util.Arrays;
@@ -30,6 +31,7 @@
 import uk.nhs.adaptors.gp2gp.common.configuration.Gp2gpConfiguration;
 import uk.nhs.adaptors.gp2gp.common.service.RandomIdGeneratorService;
 import uk.nhs.adaptors.gp2gp.ehr.EhrExtractStatusService;
+import uk.nhs.adaptors.gp2gp.ehr.exception.XmlSchemaValidationException;
 import uk.nhs.adaptors.gp2gp.ehr.mapper.EhrExtractMapper;
 import uk.nhs.adaptors.gp2gp.ehr.mapper.IdMapper;
 import uk.nhs.adaptors.gp2gp.ehr.mapper.MessageContext;
@@ -80,34 +82,34 @@ void setup() {
     @Test
     void When_GettingExternalAttachments_Expect_AllDocumentReferenceResourcesAreMapped() {
         when(randomIdGeneratorService.createNewId()).thenReturn(
-            NEW_DOC_MANIFEST_ID_1,
-            NEW_DOC_MANIFEST_ID_2
+                NEW_DOC_MANIFEST_ID_1,
+                NEW_DOC_MANIFEST_ID_2
         );
         when(randomIdGeneratorService.createNewOrUseExistingUUID(anyString())).thenReturn(
-            NEW_DOC_MANIFEST_ID_1,
-            NEW_DOC_MANIFEST_ID_2
+                NEW_DOC_MANIFEST_ID_1,
+                NEW_DOC_MANIFEST_ID_2
         );
         when(gp2gpConfiguration.getLargeAttachmentThreshold()).thenReturn(LARGE_MESSAGE_THRESHOLD);
         when(supportedContentTypes.isContentTypeSupported(any())).thenReturn(true);
 
         var mappedExternalAttachments = getMappedExternalAttachments(
-            buildDocumentReference(ID_1, "/" + NEW_DOC_REF_ID_1, null, ATTACHMENT_1_SIZE, "text/plain"),
-            buildDocumentReference(ID_2, "/" + NEW_DOC_REF_ID_2, null, ATTACHMENT_2_SIZE, "text/html")
+                buildDocumentReference(ID_1, "/" + NEW_DOC_REF_ID_1, null, ATTACHMENT_1_SIZE, "text/plain"),
+                buildDocumentReference(ID_2, "/" + NEW_DOC_REF_ID_2, null, ATTACHMENT_2_SIZE, "text/html")
         );
 
         assertThat(mappedExternalAttachments).usingRecursiveComparison().isEqualTo(
-            List.of(
-                buildExternalAttachment(
-                    NEW_DOC_MANIFEST_ID_1, NEW_DOC_MANIFEST_ID_1, "/" + NEW_DOC_REF_ID_1, null,
-                    "111_new_doc_manifest_id.txt", "text/plain",
-                    buildAttachmentDescription(NEW_DOC_MANIFEST_ID_1)
-                ),
-                buildExternalAttachment(
-                    NEW_DOC_MANIFEST_ID_2, NEW_DOC_MANIFEST_ID_2, "/" + NEW_DOC_REF_ID_2, null,
-                    "222_new_doc_manifest_id.html", "text/html",
-                    buildAttachmentDescription(NEW_DOC_MANIFEST_ID_2)
+                List.of(
+                        buildExternalAttachment(
+                                NEW_DOC_MANIFEST_ID_1, NEW_DOC_MANIFEST_ID_1, "/" + NEW_DOC_REF_ID_1, null,
+                                "111_new_doc_manifest_id.txt", "text/plain",
+                                buildAttachmentDescription(NEW_DOC_MANIFEST_ID_1)
+                        ),
+                        buildExternalAttachment(
+                                NEW_DOC_MANIFEST_ID_2, NEW_DOC_MANIFEST_ID_2, "/" + NEW_DOC_REF_ID_2, null,
+                                "222_new_doc_manifest_id.html", "text/html",
+                                buildAttachmentDescription(NEW_DOC_MANIFEST_ID_2)
+                        )
                 )
-            )
         );
     }
 
@@ -118,13 +120,13 @@ void When_GettingExternalAttachment_WithWrongContentType_Expect_AbsentAttachment
         when(gp2gpConfiguration.getLargeAttachmentThreshold()).thenReturn(LARGE_MESSAGE_THRESHOLD);
 
         var mappedExternalAttachments = getMappedAbsentAttachments(
-            buildDocumentReference(ID_1, "/" + NEW_DOC_REF_ID_1, null, ATTACHMENT_1_SIZE, UNSUPPORTED_CONTENT_TYPE)
+                buildDocumentReference(ID_1, "/" + NEW_DOC_REF_ID_1, null, ATTACHMENT_1_SIZE, UNSUPPORTED_CONTENT_TYPE)
         );
 
         assertThat(mappedExternalAttachments).usingRecursiveComparison().isEqualTo(List.of(buildExternalAttachment(
-            NEW_DOC_MANIFEST_ID_1, NEW_DOC_MANIFEST_ID_1, "/" + NEW_DOC_REF_ID_1, null,
-            "AbsentAttachment111_new_doc_manifest_id.txt", "text/plain",
-            buildAttachmentDescription(NEW_DOC_MANIFEST_ID_1)
+                NEW_DOC_MANIFEST_ID_1, NEW_DOC_MANIFEST_ID_1, "/" + NEW_DOC_REF_ID_1, null,
+                "AbsentAttachment111_new_doc_manifest_id.txt", "text/plain",
+                buildAttachmentDescription(NEW_DOC_MANIFEST_ID_1)
         )));
     }
 
@@ -135,13 +137,13 @@ void When_GettingExternalAttachment_WithTitleAndNoUrl_Expect_AbsentAttachmentMap
         when(gp2gpConfiguration.getLargeAttachmentThreshold()).thenReturn(LARGE_MESSAGE_THRESHOLD);
 
         var mappedExternalAttachments = getMappedAbsentAttachments(
-            buildDocumentReference(ID_1, null, "some title", ATTACHMENT_1_SIZE, "text/plain")
+                buildDocumentReference(ID_1, null, "some title", ATTACHMENT_1_SIZE, "text/plain")
         );
 
         assertThat(mappedExternalAttachments).usingRecursiveComparison().isEqualTo(List.of(buildExternalAttachment(
-            NEW_DOC_MANIFEST_ID_1, NEW_DOC_MANIFEST_ID_1, null, "some title",
-            "AbsentAttachment111_new_doc_manifest_id.txt", "text/plain",
-            buildAttachmentDescription(NEW_DOC_MANIFEST_ID_1)
+                NEW_DOC_MANIFEST_ID_1, NEW_DOC_MANIFEST_ID_1, null, "some title",
+                "AbsentAttachment111_new_doc_manifest_id.txt", "text/plain",
+                buildAttachmentDescription(NEW_DOC_MANIFEST_ID_1)
         )));
     }
 
@@ -154,15 +156,16 @@ void When_GettingHL7_Expect_BundleAndStructuredRecordAreMapped() {
         var ehrExtractTemplateParameters = mock(EhrExtractTemplateParameters.class);
 
         when(ehrExtractMapper.mapBundleToEhrFhirExtractParams(structuredTaskDefinition, bundle))
-            .thenReturn(ehrExtractTemplateParameters);
+                .thenReturn(ehrExtractTemplateParameters);
         when(ehrExtractMapper.mapEhrExtractToXml(ehrExtractTemplateParameters)).thenReturn(ehrExtractContent);
         when(outputMessageWrapperMapper.map(structuredTaskDefinition, ehrExtractContent))
-            .thenReturn(expectedHL7);
+                .thenReturn(expectedHL7);
 
         var actualHL7 = structuredRecordMappingService.mapStructuredRecordToEhrExtractXml(structuredTaskDefinition, bundle);
 
         verify(ehrExtractMapper).mapBundleToEhrFhirExtractParams(structuredTaskDefinition, bundle);
         verify(ehrExtractMapper).mapEhrExtractToXml(ehrExtractTemplateParameters);
+        verify(ehrExtractMapper).mapEhrExtractToXml(ehrExtractTemplateParameters);
         verify(outputMessageWrapperMapper).map(structuredTaskDefinition, ehrExtractContent);
 
         assertThat(actualHL7).isEqualTo(expectedHL7);
@@ -196,7 +199,7 @@ private Bundle getBundleWith(DocumentReference... documentReferences) {
         var bundle = new Bundle().addEntry(new Bundle.BundleEntryComponent().setResource(new Patient()));
 
         Arrays.stream(documentReferences).forEach(
-            documentReference -> bundle.addEntry(new Bundle.BundleEntryComponent().setResource(documentReference))
+                documentReference -> bundle.addEntry(new Bundle.BundleEntryComponent().setResource(documentReference))
         );
         return bundle;
     }
@@ -280,6 +283,40 @@ void When_BuildingSkeletonForEhrExtractWithoutChildComponentNodesToReplace_Expec
         assertXMLEquals(skeletonEhrExtract, expectedSkeletonEhrExtract);
     }
 
+    @Test
+    void When_XmlSchemaValidationFails_Expect_ErrorLoggedAndProcessingContinues() {
+        var structuredTaskDefinition = mock(GetGpcStructuredTaskDefinition.class);
+        var bundle = mock(Bundle.class);
+        var ehrExtractTemplateParameters = mock(EhrExtractTemplateParameters.class);
+
+        var ehrExtractContent = "<EhrExtract>some invalid content</EhrExtract>";
+        var expectedHL7 = "some wrapped hl7 message";
+        var conversationId = "conversation-id";
+        var ehrExtractId = "ehr-extract-id";
+
+        when(ehrExtractMapper.mapBundleToEhrFhirExtractParams(structuredTaskDefinition, bundle))
+                .thenReturn(ehrExtractTemplateParameters);
+        when(ehrExtractMapper.mapEhrExtractToXml(ehrExtractTemplateParameters)).thenReturn(ehrExtractContent);
+        when(ehrExtractTemplateParameters.getEhrExtractId()).thenReturn(ehrExtractId);
+        when(structuredTaskDefinition.getConversationId()).thenReturn(conversationId);
+        when(outputMessageWrapperMapper.map(structuredTaskDefinition, ehrExtractContent))
+                .thenReturn(expectedHL7);
+
+        doThrow(new XmlSchemaValidationException("Invalid XML", new RuntimeException("Invalid XML")))
+                .when(ehrExtractMapper).validateXmlAgainstSchema(ehrExtractContent);
+
+        var actualHL7 = structuredRecordMappingService.mapStructuredRecordToEhrExtractXml(structuredTaskDefinition, bundle);
+
+        verify(ehrExtractMapper).mapBundleToEhrFhirExtractParams(structuredTaskDefinition, bundle);
+        verify(ehrExtractMapper).mapEhrExtractToXml(ehrExtractTemplateParameters);
+        verify(ehrExtractMapper).validateXmlAgainstSchema(ehrExtractContent);
+        verify(outputMessageWrapperMapper).map(structuredTaskDefinition, ehrExtractContent);
+        verify(ehrExtractStatusService).saveEhrExtractMessageId(conversationId, ehrExtractId);
+
+        assertThat(actualHL7).isEqualTo(expectedHL7);
+    }
+
+
     public static void assertXMLEquals(String actualXML, String expectedXML) throws Exception {
         XMLUnit.setIgnoreWhitespace(true);
 
@@ -293,37 +330,37 @@ private static OutboundMessage.ExternalAttachment buildExternalAttachment(String
                                                                               String filename, String contentType,
                                                                               OutboundMessage.AttachmentDescription description) {
         return OutboundMessage.ExternalAttachment.builder()
-            .title(title)
-            .documentId(documentID)
-            .messageId(messageID)
-            .description(description.toString())
-            .url(url)
-            .filename(filename)
-            .identifier(List.of())
-            .contentType(contentType)
-            .build();
+                .title(title)
+                .documentId(documentID)
+                .messageId(messageID)
+                .description(description.toString())
+                .url(url)
+                .filename(filename)
+                .identifier(List.of())
+                .contentType(contentType)
+                .build();
     }
 
     private static OutboundMessage.AttachmentDescription buildAttachmentDescription(String documentId) {
         return OutboundMessage.AttachmentDescription.builder()
-            .fileName(null)
-            .contentType(null)
-            .compressed(false)
-            .largeAttachment(false)
-            .originalBase64(false)
-            .documentId(documentId)
-            .build();
+                .fileName(null)
+                .contentType(null)
+                .compressed(false)
+                .largeAttachment(false)
+                .originalBase64(false)
+                .documentId(documentId)
+                .build();
     }
 
     private static DocumentReference buildDocumentReference(String id, String attachmentURL, String attachmentTitle,
-        int size, String contentType) {
+                                                            int size, String contentType) {
         var documentReference = new DocumentReference();
         documentReference.setId(buildIdType(ResourceType.DocumentReference, id));
         documentReference.getContentFirstRep().setAttachment(new Attachment()
-            .setUrl(attachmentURL)
-            .setTitle(attachmentTitle)
-            .setSize(size)
-            .setContentType(contentType));
+                .setUrl(attachmentURL)
+                .setTitle(attachmentTitle)
+                .setSize(size)
+                .setContentType(contentType));
         return documentReference;
     }
 }
diff --git a/service/src/test/java/uk/nhs/adaptors/gp2gp/uat/EhrExtractUATTest.java b/service/src/test/java/uk/nhs/adaptors/gp2gp/uat/EhrExtractUATTest.java
index 71400dfd5..616f8d0c4 100644
--- a/service/src/test/java/uk/nhs/adaptors/gp2gp/uat/EhrExtractUATTest.java
+++ b/service/src/test/java/uk/nhs/adaptors/gp2gp/uat/EhrExtractUATTest.java
@@ -157,7 +157,7 @@ public void setUp() {
         final NonConsultationResourceMapper nonConsultationResourceMapper =
             new NonConsultationResourceMapper(messageContext, randomIdGeneratorService, encounterComponentsMapper,
                 new BloodPressureValidator());
-        ehrExtractMapper = new EhrExtractMapper(randomIdGeneratorService, timestampService, encounterMapper,
+        ehrExtractMapper = new EhrExtractMapper(redactionsContext, randomIdGeneratorService, timestampService, encounterMapper,
             nonConsultationResourceMapper, agentDirectoryMapper, messageContext);
         lenient().when(confidentialityService.generateConfidentialityCode(any()))
             .thenReturn(Optional.empty());
diff --git a/service/src/test/resources/complete-and-validated-xml-test-file-non-redaction.xml b/service/src/test/resources/complete-and-validated-xml-test-file-non-redaction.xml
new file mode 100644
index 000000000..fcc6db1af
--- /dev/null
+++ b/service/src/test/resources/complete-and-validated-xml-test-file-non-redaction.xml
@@ -0,0 +1,445 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<RCMR_IN030000UK06 xmlns="urn:hl7-org:v3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:hl7-org:v3 ..\Schemas\RCMR_IN030000UK06.xsd">
+    <id root="60A9EA7E-13BC-4CAB-94B9-E0094946C79D" />
+    <creationTime value="20250804144930" />
+    <versionCode code="V3NPfIT3.1.10" />
+    <interactionId root="2.16.840.1.113883.2.1.3.2.4.12" extension="RCMR_IN030000UK06" />
+    <processingCode code="P" />
+    <processingModeCode code="T" />
+    <acceptAckCode code="NE" />
+    <communicationFunctionRcv typeCode="RCV">
+        <device classCode="DEV" determinerCode="INSTANCE">
+            <id root="1.2.826.0.1285.0.2.0.106" extension="GP2GPTEST" />
+        </device>
+    </communicationFunctionRcv>
+    <communicationFunctionSnd typeCode="SND">
+        <device classCode="DEV" determinerCode="INSTANCE">
+            <id root="1.2.826.0.1285.0.2.0.106" extension="GP2GPTEST" />
+        </device>
+    </communicationFunctionSnd>
+    <ControlActEvent classCode="CACT" moodCode="EVN">
+        <author1 typeCode="AUT">
+            <AgentSystemSDS classCode="AGNT">
+                <agentSystemSDS classCode="DEV" determinerCode="INSTANCE">
+                    <id root="1.2.826.0.1285.0.2.0.106" extension="GP2GPTEST" />
+                </agentSystemSDS>
+            </AgentSystemSDS>
+        </author1>
+        <subject typeCode="SUBJ" contextConductionInd="false">
+            <EhrExtract classCode="EXTRACT" moodCode="EVN">
+                <id root="2428ED19-DBB6-41B7-B40D-8613EF5DF029" />
+                <statusCode code="COMPLETE" />
+                <availabilityTime value="20250804144930" />
+                <recordTarget typeCode="RCT">
+                    <patient classCode="PAT">
+                        <id root="2.16.840.1.113883.2.1.4.1" extension="9736169391" />
+                    </patient>
+                </recordTarget>
+                <author typeCode="AUT">
+                    <time value="20250804144930" />
+                    <AgentOrgSDS classCode="AGNT">
+                        <agentOrganizationSDS classCode="ORG" determinerCode="INSTANCE">
+                            <id root="1.2.826.0.1285.0.1.10" extension="GP2GPTEST" />
+                        </agentOrganizationSDS>
+                    </AgentOrgSDS>
+                </author>
+                <destination typeCode="DST">
+                    <AgentOrgSDS classCode="AGNT">
+                        <agentOrganizationSDS classCode="ORG" determinerCode="INSTANCE">
+                            <id root="1.2.826.0.1285.0.1.10" extension="GP2GPTEST" />
+                        </agentOrganizationSDS>
+                    </AgentOrgSDS>
+                </destination>
+                <component typeCode="COMP">
+                    <ehrFolder classCode="FOLDER" moodCode="EVN">
+                        <id root="D016EBE9-412D-463E-B24E-B96361F8B241" />
+                        <statusCode code="COMPLETE" />
+                        <effectiveTime>
+                            <low value="20250801"/>
+                        </effectiveTime>
+                        <availabilityTime value="20250804144930" />
+                        <author typeCode="AUT">
+                            <time value="20250804144930" />
+                            <AgentOrgSDS classCode="AGNT">
+                                <agentOrganizationSDS classCode="ORG" determinerCode="INSTANCE">
+                                    <id root="1.2.826.0.1285.0.1.10" extension="GP2GPTEST" />
+                                </agentOrganizationSDS>
+                            </AgentOrgSDS>
+                        </author>
+                        <responsibleParty typeCode="RESP">
+                            <agentDirectory classCode="AGNT">
+                                <part typeCode="PART">
+                                    <Agent classCode="AGNT">
+                                        <id root="5A33F5E1-28EA-453D-BAC5-BBD4AA855D16"/>
+                                        <code nullFlavor="UNK">
+                                            <originalText>Unknown</originalText>
+                                        </code>
+                                        <agentPerson classCode="PSN" determinerCode="INSTANCE">
+                                            <name>
+                                                <family>Spring Hall Group Practice</family>
+                                            </name>
+                                        </agentPerson>
+                                    </Agent>
+                                </part>
+                                <part typeCode="PART">
+                                    <Agent classCode="AGNT">
+                                        <id root="F6A7EE9B-B2E0-441E-A97B-9D6FD2EB439B"/>
+                                        <code nullFlavor="UNK">
+                                            <originalText>Unknown</originalText>
+                                        </code>
+                                        <agentPerson classCode="PSN" determinerCode="INSTANCE">
+                                            <name>
+                                                <given>Gareth</given>
+                                                <family>Roberts</family>
+                                            </name>
+                                        </agentPerson>
+                                        <representedOrganization classCode="ORG" determinerCode="INSTANCE">
+                                            <name>Spring Hall Group Practice</name>
+                                            <telecom value="tel:+441273749184" use="WP"/>
+                                            <addr use="WP">
+                                                <streetAddressLine>101 Yvonne Falls</streetAddressLine>
+                                                <streetAddressLine>West Carey</streetAddressLine>
+                                                <postalCode>MK3 7SA</postalCode>
+                                            </addr>
+                                        </representedOrganization>
+                                    </Agent>
+                                </part>
+                            </agentDirectory>
+                        </responsibleParty>
+
+                        <component typeCode="COMP">
+                            <ehrComposition classCode="COMPOSITION" moodCode="EVN">
+                                <id root="55CEA5E1-5B8F-47C3-BDF1-5561A2A3379D" />
+                                <code code="196401000000100" displayName="Non-consultation data" codeSystem="2.16.840.1.113883.2.1.3.2.4.15"/>
+                                <statusCode code="COMPLETE" />
+                                <effectiveTime>
+                                    <center value="20250801"/>
+                                </effectiveTime>
+                                <availabilityTime value="20250801134900"/>
+                                <author typeCode="AUT" contextControlCode="OP">
+                                    <time value="20250801134900" />
+                                    <agentRef classCode="AGNT">
+                                        <id root="F6A7EE9B-B2E0-441E-A97B-9D6FD2EB439B" />
+                                    </agentRef>
+                                </author>
+                                <Participant2 typeCode="PRF" contextControlCode="OP">
+                                    <agentRef classCode="AGNT">
+                                        <id root="F6A7EE9B-B2E0-441E-A97B-9D6FD2EB439B"/>
+                                    </agentRef>
+                                </Participant2>
+                                <component typeCode="COMP">
+                                    <CompoundStatement classCode="CATEGORY" moodCode="EVN">
+                                        <id root="019865AF-3316-7000-BA5C-F38F58D45D46"/>
+                                        <code code="14L..00" codeSystem="2.16.840.1.113883.2.1.6.2" displayName="H/O: drug allergy"/>
+                                        <statusCode code="COMPLETE"/>
+                                        <effectiveTime>
+                                            <center value="20250801"/>
+                                        </effectiveTime>
+                                        <availabilityTime value="20250801134900"/>
+                                        <component typeCode="COMP" contextConductionInd="true">
+                                            <ObservationStatement classCode="OBS" moodCode="ENV">
+                                                <id root="019865AF-3316-7000-BA5C-F38F58D45D46"/>
+                                                <code code="3299729014" codeSystem="2.16.840.1.113883.2.1.3.2.4.15" displayName="Allergy to banana">
+                                                    <originalText>Allergy to banana</originalText>
+                                                </code>
+                                                <statusCode code="COMPLETE"/>
+                                                <effectiveTime>
+                                                    <center value="20250801"/>
+                                                </effectiveTime>
+                                                <availabilityTime value="20250801134900"/>
+                                                <pertinentInformation typeCode="PERT">
+                                                    <sequenceNumber value="+1"/>
+                                                    <pertinentAnnotation classCode="OBS" moodCode="EVN">
+                                                        <text>Status: Active Reaction 1 Severity: MILD Manifestation(s): NoInformation Certainty: Unlikely</text>
+                                                    </pertinentAnnotation>
+                                                </pertinentInformation>
+                                                <Participant typeCode="AUT" contextControlCode="OP">
+                                                    <agentRef classCode="AGNT">
+                                                        <id root="F6A7EE9B-B2E0-441E-A97B-9D6FD2EB439B"/>
+                                                    </agentRef>
+                                                </Participant>
+                                                <Participant typeCode="PRF" contextControlCode="OP">
+                                                    <agentRef classCode="AGNT">
+                                                        <id root="F6A7EE9B-B2E0-441E-A97B-9D6FD2EB439B"/>
+                                                    </agentRef>
+                                                </Participant>
+                                            </ObservationStatement>
+                                        </component>
+                                    </CompoundStatement>
+                                </component>
+                            </ehrComposition>
+                        </component>
+                        <component typeCode="COMP">
+                            <ehrComposition classCode="COMPOSITION" moodCode="EVN">
+                                <id root="AF114A85-2B95-44A2-B0EA-F7B5D3F2B74C" />
+                                <code code="196391000000103" displayName="Non-consultation medication data" codeSystem="2.16.840.1.113883.2.1.3.2.4.15"/>
+                                <statusCode code="COMPLETE" />
+                                <effectiveTime>
+                                    <center value="20250801"/>
+                                </effectiveTime>
+                                <availabilityTime value="20250801"/>
+                                <author typeCode="AUT" contextControlCode="OP">
+                                    <time value="20250801" />
+                                    <agentRef classCode="AGNT">
+                                        <id root="F6A7EE9B-B2E0-441E-A97B-9D6FD2EB439B" />
+                                    </agentRef>
+                                </author>
+                                <Participant2 typeCode="PRF" contextControlCode="OP">
+                                    <agentRef classCode="AGNT">
+                                        <id root="F6A7EE9B-B2E0-441E-A97B-9D6FD2EB439B"/>
+                                    </agentRef>
+                                </Participant2>
+                                <component typeCode="COMP">
+                                    <MedicationStatement classCode="SBADM" moodCode="INT">
+                                        <id root="C40A2978-5483-4B7B-B89E-B9BF9C68A2C0"/>
+                                        <statusCode code="COMPLETE"/>
+                                        <effectiveTime>
+                                            <low value="20250801"/><high value="20250820"/>
+                                        </effectiveTime>
+                                        <availabilityTime value="20250801"/>
+                                        <consumable typeCode="CSM">
+                                            <manufacturedProduct classCode="MANU">
+                                                <manufacturedMaterial determinerCode="KIND" classCode="MMAT">
+                                                    <code code="42104711000001101" codeSystem="2.16.840.1.113883.2.1.3.2.4.15" displayName="Ibuprofen 200mg capsules">
+                                                    </code>
+                                                </manufacturedMaterial>
+                                            </manufacturedProduct>
+                                        </consumable>
+                                        <component typeCode="COMP">
+                                            <ehrSupplyAuthorise>
+                                                <id root="64B7FD49-8D17-4795-A181-82BE9DA20BB5"/>
+                                                <code code="394823006" codeSystem="2.16.840.1.113883.2.1.3.2.4.15" displayName="NHS Prescription">
+                                                </code>
+                                                <statusCode code="COMPLETE"/>
+                                                <effectiveTime>
+                                                    <low value="20250801"/><high value="20250820"/>
+                                                </effectiveTime>
+                                                <availabilityTime value="20250801"/>
+                                                <repeatNumber value="0"/>
+                                                <quantity value="27" unit="1">
+                                                    <translation value="27">
+                                                        <originalText>capsule</originalText>
+                                                    </translation>
+                                                </quantity>
+                                                <pertinentInformation typeCode="PERT">
+                                                    <pertinentSupplyAnnotation>
+                                                        <text>Expected Supply Duration: 20 days</text>
+                                                    </pertinentSupplyAnnotation>
+                                                </pertinentInformation>
+                                            </ehrSupplyAuthorise>
+                                        </component>
+                                        <pertinentInformation typeCode="PERT">
+                                            <pertinentMedicationDosage classCode="SBADM" moodCode="RMD">
+                                                <text>Take 2 capsules four times a day - with or after food - oral</text>
+                                            </pertinentMedicationDosage>
+                                        </pertinentInformation>
+                                        <Participant typeCode="AUT" contextControlCode="OP">
+                                            <agentRef classCode="AGNT">
+                                                <id root="F6A7EE9B-B2E0-441E-A97B-9D6FD2EB439B"/>
+                                            </agentRef>
+                                        </Participant>
+                                    </MedicationStatement>
+                                </component>
+                            </ehrComposition>
+                        </component>
+                        <component typeCode="COMP">
+                            <ehrComposition classCode="COMPOSITION" moodCode="EVN">
+                                <id root="F6106F94-4DD9-4C39-8E5D-FCE614D42A91" />
+                                <code code="196391000000103" displayName="Non-consultation medication data" codeSystem="2.16.840.1.113883.2.1.3.2.4.15"/>
+                                <statusCode code="COMPLETE" />
+                                <effectiveTime>
+                                    <center value="20250801"/>
+                                </effectiveTime>
+                                <availabilityTime value="20250801"/>
+                                <author typeCode="AUT" contextControlCode="OP">
+                                    <time value="20250801" />
+                                    <agentRef classCode="AGNT">
+                                        <id root="F6A7EE9B-B2E0-441E-A97B-9D6FD2EB439B" />
+                                    </agentRef>
+                                </author>
+                                <Participant2 typeCode="PRF" contextControlCode="OP">
+                                    <agentRef classCode="AGNT">
+                                        <id root="F6A7EE9B-B2E0-441E-A97B-9D6FD2EB439B"/>
+                                    </agentRef>
+                                </Participant2>
+                                <component typeCode="COMP">
+                                    <MedicationStatement classCode="SBADM" moodCode="ORD">
+                                        <id root="019865B0-FF16-73B3-804E-B6A481968B58"/>
+                                        <statusCode code="COMPLETE"/>
+                                        <effectiveTime>
+                                            <low value="20250801"/><high value="20250820"/>
+                                        </effectiveTime>
+                                        <availabilityTime value="20250801"/>
+                                        <consumable typeCode="CSM">
+                                            <manufacturedProduct classCode="MANU">
+                                                <manufacturedMaterial determinerCode="KIND" classCode="MMAT">
+                                                    <code code="42104711000001101" codeSystem="2.16.840.1.113883.2.1.3.2.4.15" displayName="Ibuprofen 200mg capsules">
+                                                    </code>
+                                                </manufacturedMaterial>
+                                            </manufacturedProduct>
+                                        </consumable>
+                                        <component typeCode="COMP">
+                                            <ehrSupplyPrescribe>
+                                                <id root="30B0D917-40E8-41AF-8CFF-196BE5C32774"/>
+                                                <code code="394823006" displayName="NHS Prescription" codeSystem="2.16.840.1.113883.2.1.3.2.4.15"/>
+                                                <statusCode code="COMPLETE"/>
+                                                <availabilityTime value="20250801"/>
+                                                <quantity value="27" unit="1">
+                                                    <translation value="27">
+                                                        <originalText>capsule</originalText>
+                                                    </translation>
+                                                </quantity>
+                                                <inFulfillmentOf typeCode="FLFS">
+                                                    <priorMedicationRef moodCode="INT">
+                                                        <id root="64B7FD49-8D17-4795-A181-82BE9DA20BB5"/>
+                                                    </priorMedicationRef>
+                                                </inFulfillmentOf>
+                                                <pertinentInformation typeCode="PERT">
+                                                    <pertinentSupplyAnnotation>
+                                                        <text>Expected Supply Duration: 20 days</text>
+                                                    </pertinentSupplyAnnotation>
+                                                </pertinentInformation>
+                                            </ehrSupplyPrescribe>
+                                        </component>
+                                        <pertinentInformation typeCode="PERT">
+                                            <pertinentMedicationDosage classCode="SBADM" moodCode="RMD">
+                                                <text>Take 2 capsules four times a day - with or after food - oral</text>
+                                            </pertinentMedicationDosage>
+                                        </pertinentInformation>
+                                        <Participant typeCode="AUT" contextControlCode="OP">
+                                            <agentRef classCode="AGNT">
+                                                <id root="F6A7EE9B-B2E0-441E-A97B-9D6FD2EB439B"/>
+                                            </agentRef>
+                                        </Participant>
+                                    </MedicationStatement>
+                                </component>
+                            </ehrComposition>
+                        </component>
+                        <component typeCode="COMP">
+                            <ehrComposition classCode="COMPOSITION" moodCode="EVN">
+                                <id root="3110DDD4-5DEC-4996-8180-DC6C776F42B0" />
+                                <code code="109341000000100" displayName="GP to GP communication transaction" codeSystem="2.16.840.1.113883.2.1.3.2.4.15"/>
+                                <statusCode code="COMPLETE" />
+                                <effectiveTime>
+                                    <center value="20250801"/>
+                                </effectiveTime>
+                                <availabilityTime value="20250801"/>
+                                <author typeCode="AUT" contextControlCode="OP">
+                                    <time value="20250801" />
+                                    <agentRef classCode="AGNT">
+                                        <id root="F6A7EE9B-B2E0-441E-A97B-9D6FD2EB439B" />
+                                    </agentRef>
+                                </author>
+                                <Participant2 typeCode="PRF" contextControlCode="OP">
+                                    <agentRef classCode="AGNT">
+                                        <id root="F6A7EE9B-B2E0-441E-A97B-9D6FD2EB439B"/>
+                                    </agentRef>
+                                </Participant2>
+                                <component typeCode="COMP" >
+                                    <NarrativeStatement classCode="OBS" moodCode="EVN">
+                                        <id root="019865AD-D03E-7000-ACF4-22E84F458604" />
+                                        <text>Checked head</text>
+                                        <statusCode code="COMPLETE" />
+                                        <availabilityTime value="20250801" />
+                                        <Participant typeCode="PRF" contextControlCode="OP">
+                                            <agentRef classCode="AGNT">
+                                                <id root="F6A7EE9B-B2E0-441E-A97B-9D6FD2EB439B"/>
+                                            </agentRef>
+                                        </Participant>
+                                    </NarrativeStatement>
+                                </component>
+                            </ehrComposition>
+                        </component>
+                        <component typeCode="COMP">
+                            <ehrComposition classCode="COMPOSITION" moodCode="EVN">
+                                <id root="D54E2999-A174-4857-9096-603F108C9EEC" />
+                                <code code="109341000000100" displayName="GP to GP communication transaction" codeSystem="2.16.840.1.113883.2.1.3.2.4.15"/>
+                                <statusCode code="COMPLETE" />
+                                <effectiveTime>
+                                    <center value="20250801"/>
+                                </effectiveTime>
+                                <availabilityTime value="20250801"/>
+                                <author typeCode="AUT" contextControlCode="OP">
+                                    <time value="20250801" />
+                                    <agentRef classCode="AGNT">
+                                        <id root="F6A7EE9B-B2E0-441E-A97B-9D6FD2EB439B" />
+                                    </agentRef>
+                                </author>
+                                <Participant2 typeCode="PRF" contextControlCode="OP">
+                                    <agentRef classCode="AGNT">
+                                        <id root="F6A7EE9B-B2E0-441E-A97B-9D6FD2EB439B"/>
+                                    </agentRef>
+                                </Participant2>
+                                <component typeCode="COMP" >
+                                    <NarrativeStatement classCode="OBS" moodCode="EVN">
+                                        <id root="019865AD-D04C-7000-9B81-E7009ECBFDF7" />
+                                        <text>Test </text>
+                                        <statusCode code="COMPLETE" />
+                                        <availabilityTime value="20250801" />
+                                        <Participant typeCode="PRF" contextControlCode="OP">
+                                            <agentRef classCode="AGNT">
+                                                <id root="F6A7EE9B-B2E0-441E-A97B-9D6FD2EB439B"/>
+                                            </agentRef>
+                                        </Participant>
+                                    </NarrativeStatement>
+                                </component>
+                            </ehrComposition>
+                        </component>
+                        <component typeCode="COMP">
+                            <ehrComposition classCode="COMPOSITION" moodCode="EVN">
+                                <id root="C3648DBF-6C68-4871-92E3-A44213DAC20D" />
+                                <code code="196401000000100" displayName="Non-consultation data" codeSystem="2.16.840.1.113883.2.1.3.2.4.15"/>
+                                <statusCode code="COMPLETE" />
+                                <effectiveTime>
+                                    <center value="20250801"/>
+                                </effectiveTime>
+                                <availabilityTime value="20250801"/>
+                                <author typeCode="AUT" contextControlCode="OP">
+                                    <time value="20250801" />
+                                    <agentRef classCode="AGNT">
+                                        <id root="5A33F5E1-28EA-453D-BAC5-BBD4AA855D16" />
+                                    </agentRef>
+                                </author>
+                                <Participant2 typeCode="PRF" contextControlCode="OP">
+                                    <agentRef classCode="AGNT">
+                                        <id root="5A33F5E1-28EA-453D-BAC5-BBD4AA855D16"/>
+                                    </agentRef>
+                                </Participant2>
+                                <component typeCode="COMP" >
+                                    <ObservationStatement classCode="OBS" moodCode="EVN">
+                                        <id root="019865C6-DE0E-72C2-AD8A-D2432A0F23E8" />
+                                        <code code="1726131000000119" codeSystem="2.16.840.1.113883.2.1.3.2.4.15" displayName="Implied consent for core Summary Care Record dataset upload">
+                                            <originalText>Implied consent for core Summary Care Record dataset upload</originalText>
+                                        </code>
+                                        <statusCode code="COMPLETE" />
+                                        <effectiveTime>
+                                            <center value="20250801"/>
+                                        </effectiveTime>
+                                        <availabilityTime value="20250801"/>
+                                        <Participant typeCode="PRF" contextControlCode="OP">
+                                            <agentRef classCode="AGNT">
+                                                <id root="5A33F5E1-28EA-453D-BAC5-BBD4AA855D16"/>
+                                            </agentRef>
+                                        </Participant>
+                                    </ObservationStatement>
+                                </component>
+                            </ehrComposition>
+                        </component>
+                    </ehrFolder>
+                </component>
+                <inFulfillmentOf typeCode="FLFS">
+                    <priorEhrRequest classCode="EXTRACT" moodCode="RQO">
+                        <id root="17A3A644-A4EB-4C0A-A870-152D310FD1F8" />
+                    </priorEhrRequest>
+                </inFulfillmentOf>
+                <limitation typeCode="LIMIT" inversionInd="true">
+                    <limitingEhrExtractSpecification classCode="OBS" moodCode="DEF">
+                        <id root="76C49C11-5271-11EA-9384-E83935108FD5" />
+                        <code code="37241000000102" codeSystem="2.16.840.1.113883.2.1.3.2.4.15" displayName="Entire record available to originator (administrative concept)" />
+                    </limitingEhrExtractSpecification>
+                </limitation>
+            </EhrExtract>
+
+        </subject>
+    </ControlActEvent>
+</RCMR_IN030000UK06>
\ No newline at end of file
diff --git a/service/src/test/resources/complete-and-validated-xml-test-file-redaction.xml b/service/src/test/resources/complete-and-validated-xml-test-file-redaction.xml
new file mode 100644
index 000000000..c42848886
--- /dev/null
+++ b/service/src/test/resources/complete-and-validated-xml-test-file-redaction.xml
@@ -0,0 +1,445 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<RCMR_IN030000UK07 xmlns="urn:hl7-org:v3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:hl7-org:v3 ..\Schemas\RCMR_IN030000UK07.xsd">
+    <id root="60A9EA7E-13BC-4CAB-94B9-E0094946C79D" />
+    <creationTime value="20250804144930" />
+    <versionCode code="V3NPfIT3.1.10" />
+    <interactionId root="2.16.840.1.113883.2.1.3.2.4.12" extension="RCMR_IN030000UK07" />
+    <processingCode code="P" />
+    <processingModeCode code="T" />
+    <acceptAckCode code="NE" />
+    <communicationFunctionRcv typeCode="RCV">
+        <device classCode="DEV" determinerCode="INSTANCE">
+            <id root="1.2.826.0.1285.0.2.0.107" extension="GP2GPTEST" />
+        </device>
+    </communicationFunctionRcv>
+    <communicationFunctionSnd typeCode="SND">
+        <device classCode="DEV" determinerCode="INSTANCE">
+            <id root="1.2.826.0.1285.0.2.0.107" extension="GP2GPTEST" />
+        </device>
+    </communicationFunctionSnd>
+    <ControlActEvent classCode="CACT" moodCode="EVN">
+        <author1 typeCode="AUT">
+            <AgentSystemSDS classCode="AGNT">
+                <agentSystemSDS classCode="DEV" determinerCode="INSTANCE">
+                    <id root="1.2.826.0.1285.0.2.0.107" extension="GP2GPTEST" />
+                </agentSystemSDS>
+            </AgentSystemSDS>
+        </author1>
+        <subject typeCode="SUBJ" contextConductionInd="false">
+            <EhrExtract classCode="EXTRACT" moodCode="EVN">
+                <id root="2428ED19-DBB6-41B7-B40D-8613EF5DF029" />
+                <statusCode code="COMPLETE" />
+                <availabilityTime value="20250804144930" />
+                <recordTarget typeCode="RCT">
+                    <patient classCode="PAT">
+                        <id root="2.16.840.1.113883.2.1.4.1" extension="9736169391" />
+                    </patient>
+                </recordTarget>
+                <author typeCode="AUT">
+                    <time value="20250804144930" />
+                    <AgentOrgSDS classCode="AGNT">
+                        <agentOrganizationSDS classCode="ORG" determinerCode="INSTANCE">
+                            <id root="1.2.826.0.1285.0.1.10" extension="GP2GPTEST" />
+                        </agentOrganizationSDS>
+                    </AgentOrgSDS>
+                </author>
+                <destination typeCode="DST">
+                    <AgentOrgSDS classCode="AGNT">
+                        <agentOrganizationSDS classCode="ORG" determinerCode="INSTANCE">
+                            <id root="1.2.826.0.1285.0.1.10" extension="GP2GPTEST" />
+                        </agentOrganizationSDS>
+                    </AgentOrgSDS>
+                </destination>
+                <component typeCode="COMP">
+                    <ehrFolder classCode="FOLDER" moodCode="EVN">
+                        <id root="D016EBE9-412D-463E-B24E-B96361F8B241" />
+                        <statusCode code="COMPLETE" />
+                        <effectiveTime>
+                            <low value="20250801"/>
+                        </effectiveTime>
+                        <availabilityTime value="20250804144930" />
+                        <author typeCode="AUT">
+                            <time value="20250804144930" />
+                            <AgentOrgSDS classCode="AGNT">
+                                <agentOrganizationSDS classCode="ORG" determinerCode="INSTANCE">
+                                    <id root="1.2.826.0.1285.0.1.10" extension="GP2GPTEST" />
+                                </agentOrganizationSDS>
+                            </AgentOrgSDS>
+                        </author>
+                        <responsibleParty typeCode="RESP">
+                            <agentDirectory classCode="AGNT">
+                                <part typeCode="PART">
+                                    <Agent classCode="AGNT">
+                                        <id root="5A33F5E1-28EA-453D-BAC5-BBD4AA855D16"/>
+                                        <code nullFlavor="UNK">
+                                            <originalText>Unknown</originalText>
+                                        </code>
+                                        <agentPerson classCode="PSN" determinerCode="INSTANCE">
+                                            <name>
+                                                <family>Spring Hall Group Practice</family>
+                                            </name>
+                                        </agentPerson>
+                                    </Agent>
+                                </part>
+                                <part typeCode="PART">
+                                    <Agent classCode="AGNT">
+                                        <id root="F6A7EE9B-B2E0-441E-A97B-9D6FD2EB439B"/>
+                                        <code nullFlavor="UNK">
+                                            <originalText>Unknown</originalText>
+                                        </code>
+                                        <agentPerson classCode="PSN" determinerCode="INSTANCE">
+                                            <name>
+                                                <given>Gareth</given>
+                                                <family>Roberts</family>
+                                            </name>
+                                        </agentPerson>
+                                        <representedOrganization classCode="ORG" determinerCode="INSTANCE">
+                                            <name>Spring Hall Group Practice</name>
+                                            <telecom value="tel:+441273749184" use="WP"/>
+                                            <addr use="WP">
+                                                <streetAddressLine>101 Yvonne Falls</streetAddressLine>
+                                                <streetAddressLine>West Carey</streetAddressLine>
+                                                <postalCode>MK3 7SA</postalCode>
+                                            </addr>
+                                        </representedOrganization>
+                                    </Agent>
+                                </part>
+                            </agentDirectory>
+                        </responsibleParty>
+
+                        <component typeCode="COMP">
+                            <ehrComposition classCode="COMPOSITION" moodCode="EVN">
+                                <id root="55CEA5E1-5B8F-47C3-BDF1-5561A2A3379D" />
+                                <code code="196401000000100" displayName="Non-consultation data" codeSystem="2.16.840.1.113883.2.1.3.2.4.15"/>
+                                <statusCode code="COMPLETE" />
+                                <effectiveTime>
+                                    <center value="20250801"/>
+                                </effectiveTime>
+                                <availabilityTime value="20250801134900"/>
+                                <author typeCode="AUT" contextControlCode="OP">
+                                    <time value="20250801134900" />
+                                    <agentRef classCode="AGNT">
+                                        <id root="F6A7EE9B-B2E0-441E-A97B-9D6FD2EB439B" />
+                                    </agentRef>
+                                </author>
+                                <Participant2 typeCode="PRF" contextControlCode="OP">
+                                    <agentRef classCode="AGNT">
+                                        <id root="F6A7EE9B-B2E0-441E-A97B-9D6FD2EB439B"/>
+                                    </agentRef>
+                                </Participant2>
+                                <component typeCode="COMP">
+                                    <CompoundStatement classCode="CATEGORY" moodCode="EVN">
+                                        <id root="019865AF-3316-7000-BA5C-F38F58D45D46"/>
+                                        <code code="14L..00" codeSystem="2.16.840.1.113883.2.1.6.2" displayName="H/O: drug allergy"/>
+                                        <statusCode code="COMPLETE"/>
+                                        <effectiveTime>
+                                            <center value="20250801"/>
+                                        </effectiveTime>
+                                        <availabilityTime value="20250801134900"/>
+                                        <component typeCode="COMP" contextConductionInd="true">
+                                            <ObservationStatement classCode="OBS" moodCode="ENV">
+                                                <id root="019865AF-3316-7000-BA5C-F38F58D45D46"/>
+                                                <code code="3299729014" codeSystem="2.16.840.1.113883.2.1.3.2.4.15" displayName="Allergy to banana">
+                                                    <originalText>Allergy to banana</originalText>
+                                                </code>
+                                                <statusCode code="COMPLETE"/>
+                                                <effectiveTime>
+                                                    <center value="20250801"/>
+                                                </effectiveTime>
+                                                <availabilityTime value="20250801134900"/>
+                                                <pertinentInformation typeCode="PERT">
+                                                    <sequenceNumber value="+1"/>
+                                                    <pertinentAnnotation classCode="OBS" moodCode="EVN">
+                                                        <text>Status: Active Reaction 1 Severity: MILD Manifestation(s): NoInformation Certainty: Unlikely</text>
+                                                    </pertinentAnnotation>
+                                                </pertinentInformation>
+                                                <Participant typeCode="AUT" contextControlCode="OP">
+                                                    <agentRef classCode="AGNT">
+                                                        <id root="F6A7EE9B-B2E0-441E-A97B-9D6FD2EB439B"/>
+                                                    </agentRef>
+                                                </Participant>
+                                                <Participant typeCode="PRF" contextControlCode="OP">
+                                                    <agentRef classCode="AGNT">
+                                                        <id root="F6A7EE9B-B2E0-441E-A97B-9D6FD2EB439B"/>
+                                                    </agentRef>
+                                                </Participant>
+                                            </ObservationStatement>
+                                        </component>
+                                    </CompoundStatement>
+                                </component>
+                            </ehrComposition>
+                        </component>
+                        <component typeCode="COMP">
+                            <ehrComposition classCode="COMPOSITION" moodCode="EVN">
+                                <id root="AF114A85-2B95-44A2-B0EA-F7B5D3F2B74C" />
+                                <code code="196391000000103" displayName="Non-consultation medication data" codeSystem="2.16.840.1.113883.2.1.3.2.4.15"/>
+                                <statusCode code="COMPLETE" />
+                                <effectiveTime>
+                                    <center value="20250801"/>
+                                </effectiveTime>
+                                <availabilityTime value="20250801"/>
+                                <author typeCode="AUT" contextControlCode="OP">
+                                    <time value="20250801" />
+                                    <agentRef classCode="AGNT">
+                                        <id root="F6A7EE9B-B2E0-441E-A97B-9D6FD2EB439B" />
+                                    </agentRef>
+                                </author>
+                                <Participant2 typeCode="PRF" contextControlCode="OP">
+                                    <agentRef classCode="AGNT">
+                                        <id root="F6A7EE9B-B2E0-441E-A97B-9D6FD2EB439B"/>
+                                    </agentRef>
+                                </Participant2>
+                                <component typeCode="COMP">
+                                    <MedicationStatement classCode="SBADM" moodCode="INT">
+                                        <id root="C40A2978-5483-4B7B-B89E-B9BF9C68A2C0"/>
+                                        <statusCode code="COMPLETE"/>
+                                        <effectiveTime>
+                                            <low value="20250801"/><high value="20250820"/>
+                                        </effectiveTime>
+                                        <availabilityTime value="20250801"/>
+                                        <consumable typeCode="CSM">
+                                            <manufacturedProduct classCode="MANU">
+                                                <manufacturedMaterial determinerCode="KIND" classCode="MMAT">
+                                                    <code code="42104711000001101" codeSystem="2.16.840.1.113883.2.1.3.2.4.15" displayName="Ibuprofen 200mg capsules">
+                                                    </code>
+                                                </manufacturedMaterial>
+                                            </manufacturedProduct>
+                                        </consumable>
+                                        <component typeCode="COMP">
+                                            <ehrSupplyAuthorise>
+                                                <id root="64B7FD49-8D17-4795-A181-82BE9DA20BB5"/>
+                                                <code code="394823007" codeSystem="2.16.840.1.113883.2.1.3.2.4.15" displayName="NHS Prescription">
+                                                </code>
+                                                <statusCode code="COMPLETE"/>
+                                                <effectiveTime>
+                                                    <low value="20250801"/><high value="20250820"/>
+                                                </effectiveTime>
+                                                <availabilityTime value="20250801"/>
+                                                <repeatNumber value="0"/>
+                                                <quantity value="27" unit="1">
+                                                    <translation value="27">
+                                                        <originalText>capsule</originalText>
+                                                    </translation>
+                                                </quantity>
+                                                <pertinentInformation typeCode="PERT">
+                                                    <pertinentSupplyAnnotation>
+                                                        <text>Expected Supply Duration: 20 days</text>
+                                                    </pertinentSupplyAnnotation>
+                                                </pertinentInformation>
+                                            </ehrSupplyAuthorise>
+                                        </component>
+                                        <pertinentInformation typeCode="PERT">
+                                            <pertinentMedicationDosage classCode="SBADM" moodCode="RMD">
+                                                <text>Take 2 capsules four times a day - with or after food - oral</text>
+                                            </pertinentMedicationDosage>
+                                        </pertinentInformation>
+                                        <Participant typeCode="AUT" contextControlCode="OP">
+                                            <agentRef classCode="AGNT">
+                                                <id root="F6A7EE9B-B2E0-441E-A97B-9D6FD2EB439B"/>
+                                            </agentRef>
+                                        </Participant>
+                                    </MedicationStatement>
+                                </component>
+                            </ehrComposition>
+                        </component>
+                        <component typeCode="COMP">
+                            <ehrComposition classCode="COMPOSITION" moodCode="EVN">
+                                <id root="F6107F94-4DD9-4C39-8E5D-FCE614D42A91" />
+                                <code code="196391000000103" displayName="Non-consultation medication data" codeSystem="2.16.840.1.113883.2.1.3.2.4.15"/>
+                                <statusCode code="COMPLETE" />
+                                <effectiveTime>
+                                    <center value="20250801"/>
+                                </effectiveTime>
+                                <availabilityTime value="20250801"/>
+                                <author typeCode="AUT" contextControlCode="OP">
+                                    <time value="20250801" />
+                                    <agentRef classCode="AGNT">
+                                        <id root="F6A7EE9B-B2E0-441E-A97B-9D6FD2EB439B" />
+                                    </agentRef>
+                                </author>
+                                <Participant2 typeCode="PRF" contextControlCode="OP">
+                                    <agentRef classCode="AGNT">
+                                        <id root="F6A7EE9B-B2E0-441E-A97B-9D6FD2EB439B"/>
+                                    </agentRef>
+                                </Participant2>
+                                <component typeCode="COMP">
+                                    <MedicationStatement classCode="SBADM" moodCode="ORD">
+                                        <id root="019865B0-FF16-73B3-804E-B6A481968B58"/>
+                                        <statusCode code="COMPLETE"/>
+                                        <effectiveTime>
+                                            <low value="20250801"/><high value="20250820"/>
+                                        </effectiveTime>
+                                        <availabilityTime value="20250801"/>
+                                        <consumable typeCode="CSM">
+                                            <manufacturedProduct classCode="MANU">
+                                                <manufacturedMaterial determinerCode="KIND" classCode="MMAT">
+                                                    <code code="42104711000001101" codeSystem="2.16.840.1.113883.2.1.3.2.4.15" displayName="Ibuprofen 200mg capsules">
+                                                    </code>
+                                                </manufacturedMaterial>
+                                            </manufacturedProduct>
+                                        </consumable>
+                                        <component typeCode="COMP">
+                                            <ehrSupplyPrescribe>
+                                                <id root="30B0D917-40E8-41AF-8CFF-196BE5C32774"/>
+                                                <code code="394823007" displayName="NHS Prescription" codeSystem="2.16.840.1.113883.2.1.3.2.4.15"/>
+                                                <statusCode code="COMPLETE"/>
+                                                <availabilityTime value="20250801"/>
+                                                <quantity value="27" unit="1">
+                                                    <translation value="27">
+                                                        <originalText>capsule</originalText>
+                                                    </translation>
+                                                </quantity>
+                                                <inFulfillmentOf typeCode="FLFS">
+                                                    <priorMedicationRef moodCode="INT">
+                                                        <id root="64B7FD49-8D17-4795-A181-82BE9DA20BB5"/>
+                                                    </priorMedicationRef>
+                                                </inFulfillmentOf>
+                                                <pertinentInformation typeCode="PERT">
+                                                    <pertinentSupplyAnnotation>
+                                                        <text>Expected Supply Duration: 20 days</text>
+                                                    </pertinentSupplyAnnotation>
+                                                </pertinentInformation>
+                                            </ehrSupplyPrescribe>
+                                        </component>
+                                        <pertinentInformation typeCode="PERT">
+                                            <pertinentMedicationDosage classCode="SBADM" moodCode="RMD">
+                                                <text>Take 2 capsules four times a day - with or after food - oral</text>
+                                            </pertinentMedicationDosage>
+                                        </pertinentInformation>
+                                        <Participant typeCode="AUT" contextControlCode="OP">
+                                            <agentRef classCode="AGNT">
+                                                <id root="F6A7EE9B-B2E0-441E-A97B-9D6FD2EB439B"/>
+                                            </agentRef>
+                                        </Participant>
+                                    </MedicationStatement>
+                                </component>
+                            </ehrComposition>
+                        </component>
+                        <component typeCode="COMP">
+                            <ehrComposition classCode="COMPOSITION" moodCode="EVN">
+                                <id root="3110DDD4-5DEC-4996-8180-DC6C776F42B0" />
+                                <code code="109341000000100" displayName="GP to GP communication transaction" codeSystem="2.16.840.1.113883.2.1.3.2.4.15"/>
+                                <statusCode code="COMPLETE" />
+                                <effectiveTime>
+                                    <center value="20250801"/>
+                                </effectiveTime>
+                                <availabilityTime value="20250801"/>
+                                <author typeCode="AUT" contextControlCode="OP">
+                                    <time value="20250801" />
+                                    <agentRef classCode="AGNT">
+                                        <id root="F6A7EE9B-B2E0-441E-A97B-9D6FD2EB439B" />
+                                    </agentRef>
+                                </author>
+                                <Participant2 typeCode="PRF" contextControlCode="OP">
+                                    <agentRef classCode="AGNT">
+                                        <id root="F6A7EE9B-B2E0-441E-A97B-9D6FD2EB439B"/>
+                                    </agentRef>
+                                </Participant2>
+                                <component typeCode="COMP" >
+                                    <NarrativeStatement classCode="OBS" moodCode="EVN">
+                                        <id root="019865AD-D03E-7000-ACF4-22E84F458604" />
+                                        <text>Checked head</text>
+                                        <statusCode code="COMPLETE" />
+                                        <availabilityTime value="20250801" />
+                                        <Participant typeCode="PRF" contextControlCode="OP">
+                                            <agentRef classCode="AGNT">
+                                                <id root="F6A7EE9B-B2E0-441E-A97B-9D6FD2EB439B"/>
+                                            </agentRef>
+                                        </Participant>
+                                    </NarrativeStatement>
+                                </component>
+                            </ehrComposition>
+                        </component>
+                        <component typeCode="COMP">
+                            <ehrComposition classCode="COMPOSITION" moodCode="EVN">
+                                <id root="D54E2999-A174-4857-9096-603F108C9EEC" />
+                                <code code="109341000000100" displayName="GP to GP communication transaction" codeSystem="2.16.840.1.113883.2.1.3.2.4.15"/>
+                                <statusCode code="COMPLETE" />
+                                <effectiveTime>
+                                    <center value="20250801"/>
+                                </effectiveTime>
+                                <availabilityTime value="20250801"/>
+                                <author typeCode="AUT" contextControlCode="OP">
+                                    <time value="20250801" />
+                                    <agentRef classCode="AGNT">
+                                        <id root="F6A7EE9B-B2E0-441E-A97B-9D6FD2EB439B" />
+                                    </agentRef>
+                                </author>
+                                <Participant2 typeCode="PRF" contextControlCode="OP">
+                                    <agentRef classCode="AGNT">
+                                        <id root="F6A7EE9B-B2E0-441E-A97B-9D6FD2EB439B"/>
+                                    </agentRef>
+                                </Participant2>
+                                <component typeCode="COMP" >
+                                    <NarrativeStatement classCode="OBS" moodCode="EVN">
+                                        <id root="019865AD-D04C-7000-9B81-E7009ECBFDF7" />
+                                        <text>Test </text>
+                                        <statusCode code="COMPLETE" />
+                                        <availabilityTime value="20250801" />
+                                        <Participant typeCode="PRF" contextControlCode="OP">
+                                            <agentRef classCode="AGNT">
+                                                <id root="F6A7EE9B-B2E0-441E-A97B-9D6FD2EB439B"/>
+                                            </agentRef>
+                                        </Participant>
+                                    </NarrativeStatement>
+                                </component>
+                            </ehrComposition>
+                        </component>
+                        <component typeCode="COMP">
+                            <ehrComposition classCode="COMPOSITION" moodCode="EVN">
+                                <id root="C3648DBF-6C68-4871-92E3-A44213DAC20D" />
+                                <code code="196401000000100" displayName="Non-consultation data" codeSystem="2.16.840.1.113883.2.1.3.2.4.15"/>
+                                <statusCode code="COMPLETE" />
+                                <effectiveTime>
+                                    <center value="20250801"/>
+                                </effectiveTime>
+                                <availabilityTime value="20250801"/>
+                                <author typeCode="AUT" contextControlCode="OP">
+                                    <time value="20250801" />
+                                    <agentRef classCode="AGNT">
+                                        <id root="5A33F5E1-28EA-453D-BAC5-BBD4AA855D16" />
+                                    </agentRef>
+                                </author>
+                                <Participant2 typeCode="PRF" contextControlCode="OP">
+                                    <agentRef classCode="AGNT">
+                                        <id root="5A33F5E1-28EA-453D-BAC5-BBD4AA855D16"/>
+                                    </agentRef>
+                                </Participant2>
+                                <component typeCode="COMP" >
+                                    <ObservationStatement classCode="OBS" moodCode="EVN">
+                                        <id root="019865C6-DE0E-72C2-AD8A-D2432A0F23E8" />
+                                        <code code="1726131000000119" codeSystem="2.16.840.1.113883.2.1.3.2.4.15" displayName="Implied consent for core Summary Care Record dataset upload">
+                                            <originalText>Implied consent for core Summary Care Record dataset upload</originalText>
+                                        </code>
+                                        <statusCode code="COMPLETE" />
+                                        <effectiveTime>
+                                            <center value="20250801"/>
+                                        </effectiveTime>
+                                        <availabilityTime value="20250801"/>
+                                        <Participant typeCode="PRF" contextControlCode="OP">
+                                            <agentRef classCode="AGNT">
+                                                <id root="5A33F5E1-28EA-453D-BAC5-BBD4AA855D16"/>
+                                            </agentRef>
+                                        </Participant>
+                                    </ObservationStatement>
+                                </component>
+                            </ehrComposition>
+                        </component>
+                    </ehrFolder>
+                </component>
+                <inFulfillmentOf typeCode="FLFS">
+                    <priorEhrRequest classCode="EXTRACT" moodCode="RQO">
+                        <id root="17A3A644-A4EB-4C0A-A870-152D310FD1F8" />
+                    </priorEhrRequest>
+                </inFulfillmentOf>
+                <limitation typeCode="LIMIT" inversionInd="true">
+                    <limitingEhrExtractSpecification classCode="OBS" moodCode="DEF">
+                        <id root="76C49C11-5271-11EA-9384-E83935108FD5" />
+                        <code code="37241000000102" codeSystem="2.16.840.1.113883.2.1.3.2.4.15" displayName="Entire record available to originator (administrative concept)" />
+                    </limitingEhrExtractSpecification>
+                </limitation>
+            </EhrExtract>
+
+        </subject>
+    </ControlActEvent>
+</RCMR_IN030000UK07>
\ No newline at end of file