diff --git a/OmopTransformer/SUS/Staging/SusAPCParser.cs b/OmopTransformer/SUS/Staging/SusAPCParser.cs
index bc3c2f1..a3b3964 100644
--- a/OmopTransformer/SUS/Staging/SusAPCParser.cs
+++ b/OmopTransformer/SUS/Staging/SusAPCParser.cs
@@ -30,219 +30,219 @@ public IEnumerable<APCRecord> ReadFile(string path, CancellationToken cancellati
             var record = new APC
             {
                 MessageId = messageId,
-                GeneratedRecordIdentifier = csv.GetField<string>("Generated Record Identifier"),
-                PBRSpellID = csv.GetField<string>("PBR Spell ID"),
-                ReasonForAccess = csv.GetField<string>("Reason for Access"),
-                CDSType = csv.GetField<string>("CDS type"),
-                ProtocolIdentifier = csv.GetField<string>("Protocol identifier"),
-                UniqueCDSIdentifier = csv.GetField<string>("Unique CDS identifier"),
-                UpdateType = csv.GetField<string>("Update type"),
-                BulkReplacementCDSGroup = csv.GetField<string>("Bulk replacement CDS group"),
-                TestIndicator = csv.GetField<string>("Test indicator"),
-                ApplicableDatetime = csv.GetField<string>("Applicable date/time"),
-                CensusDate = csv.GetField<string>("Census date"),
-                ExtractDatetime = csv.GetField<string>("Extract date/time"),
-                ReportPeriodStartDate = csv.GetField<string>("Report period Start Date"),
-                ReportPeriodEndDate = csv.GetField<string>("Report period End Date"),
-                OrganisationCodeSenderOfTransaction = csv.GetField<string>("Organisation code: Sender of transaction"),
-                OrganisationCodeTypeofSender = csv.GetField<string>("Organisation Code Type of Sender"),
-                SubmissionDate = csv.GetField<string>("Submission Date"),
-                CDSInterchangeID = csv.GetField<string>("CDS Interchange ID"),
-                LocalPatientIdentifier = csv.GetField<string>("Local Patient Identifier"),
-                OrganisationCodeLocalPatientIdentifier = csv.GetField<string>("Organisation Code (Local Patient Identifier)"),
-                OrganisationCodeTypeLocalPatientIdentifier = csv.GetField<string>("Organisation Code Type (Local Patient Identifier)"),
-                NHSNumber = csv.GetField<string>("NHS Number"),
-                DateofBirth = csv.GetField<string>("Date of Birth"),
-                BirthWeight = csv.GetField<string>("Birth Weight"),
-                LiveOrStillBirth = csv.GetField<string>("Live or Still Birth"),
-                CarerSupportIndicator = csv.GetField<string>("Carer Support Indicator"),
-                LegalStatusClassificationOnAdmissionPsychiatricCensusOnly = csv.GetField<string>("Legal Status Classification on Admission (Psychiatric Census Only)"),
-                EthnicGroup = csv.GetField<string>("Ethnic Group"),
-                MaritalStatusPsychiatricCensusOnly = csv.GetField<string>("Marital Status (Psychiatric Census Only)"),
-                NHSNumberTraceStatus = csv.GetField<string>("NHS Number Trace Status"),
-                WithheldIdentityReason = csv.GetField<string>("Withheld Identity Reason"),
-                Sex = csv.GetField<string>("Sex"),
-                PregnancyTotalPreviousPregnancies = csv.GetField<string>("Pregnancy Total Previous Pregnancies"),
-                NameFormatCode = csv.GetField<string>("Name Format Code"),
-                PatientName = csv.GetField<string>("Patient Name"),
-                PersonTitle = csv.GetField<string>("Person Title"),
-                PersonGivenName = csv.GetField<string>("Person Given Name"),
-                PersonFamilyName = csv.GetField<string>("Person Family Name"),
-                PersonNameSuffix = csv.GetField<string>("Person Name Suffix"),
-                PersonInitials = csv.GetField<string>("Person Initials"),
-                AddressFormatCode = csv.GetField<string>("Address Format Code"),
-                PatientUsualAddress = csv.GetField<string>("Patient Usual Address"),
-                Postcode = csv.GetField<string>("Postcode"),
-                OrganisationCodeResidenceResponsibility = csv.GetField<string>("Organisation Code (Residence Responsibility)"),
-                PCTofResidence = csv.GetField<string>("PCT of Residence"),
-                OrganisationCodeTypePCTofResidence = csv.GetField<string>("Organisation Code Type (PCT of Residence)"),
-                OSVClassificationatCDSActivityDate = csv.GetField<string>("OSV Classification at CDS Activity Date"),
-                HospitalProviderSpellNumber = csv.GetField<string>("Hospital Provider Spell Number"),
-                AdministrativeCategory = csv.GetField<string>("Administrative Category"),
-                PatientClassification = csv.GetField<string>("Patient Classification"),
-                AdmissionMethodHospitalProviderSpell = csv.GetField<string>("Admission Method (Hospital Provider Spell)"),
-                DischargeDestinationHospitalProviderSpell = csv.GetField<string>("Discharge Destination (Hospital Provider Spell)"),
-                DischargeMethodHospitalProviderSpell = csv.GetField<string>("Discharge Method (Hospital Provider Spell)"),
-                SourceOfAdmissionHospitalProviderSpell = csv.GetField<string>("Source of Admission (Hospital Provider Spell)"),
-                StartDateHospitalProviderSpell = csv.GetField<string>("Start Date (Hospital Provider Spell)"),
-                StartTimeHospitalProviderSpell = csv.GetField<string>("Start Time (Hospital Provider Spell)"),
-                DischargeDateFromHospitalProviderSpell = csv.GetField<string>("Discharge Date (From Hospital Provider Spell)"),
-                DischargeTimeHospitalProviderSpell = csv.GetField<string>("Discharge Time (Hospital Provider Spell)"),
-                DischargeToHospitalAtHomeServiceIndicator = csv.GetField<string>("Discharge To Hospital At Home Service Indicator"),
-                EpisodeNumber = csv.GetField<string>("Episode Number"),
-                FirstRegularDayNightAdmission = csv.GetField<string>("First Regular Day Night Admission"),
-                LastEpisodeInSpellIndicator = csv.GetField<string>("Last Episode In Spell Indicator"),
-                NeonatalLevelOfCare = csv.GetField<string>("Neonatal Level of Care"),
-                OperationStatus = csv.GetField<string>("Operation Status"),
-                PsychiatricPatientStatus = csv.GetField<string>("Psychiatric Patient Status"),
-                StartDateConsultantEpisode = csv.GetField<string>("Start Date (Consultant Episode)"),
-                StartTimeEpisode = csv.GetField<string>("Start Time (Episode)"),
-                EndDateConsultantEpisode = csv.GetField<string>("End Date (Consultant Episode)"),
-                EndTimeEpisode = csv.GetField<string>("End Time (Episode)"),
-                LengthOfStayAdjustmentRehabilitation = csv.GetField<string>("Length Of Stay Adjustment (Rehabilitation)"),
-                LengthOfStayAdjustmentSpecialistPalliativeCare = csv.GetField<string>("Length Of Stay Adjustment (Specialist Palliative Care)"),
-                CommissioningSerialNumber = csv.GetField<string>("Commissioning Serial Number"),
-                NHSServiceAgreementLineNumber = csv.GetField<string>("NHS Service Agreement Line Number"),
-                ProviderReferenceNumber = csv.GetField<string>("Provider Reference Number"),
-                CommissionerReferenceNumber = csv.GetField<string>("Commissioner Reference Number"),
-                OrganisationCodeCodeOfProvider = csv.GetField<string>("Organisation Code Code of Provider"),
-                OrganisationCodeTypeOfProvider = csv.GetField<string>("Organisation Code Type of Provider"),
-                OrganisationCodeCodeOfCommissioner = csv.GetField<string>("Organisation Code Code of Commissioner"),
-                OrganisationCodeTypeofCommissioner = csv.GetField<string>("Organisation Code Type of Commissioner"),
-                ConsultantCode = csv.GetField<string>("Consultant Code"),
-                MainSpecialtyCode = csv.GetField<string>("Main Specialty Code"),
-                TreatmentFunctionCode = csv.GetField<string>("Treatment Function Code"),
-                LocalSubSpecialtyCode = csv.GetField<string>("Local Sub Specialty Code"),
-                MultiProfessionalOrMultidisciplinaryIndCode = csv.GetField<string>("Multi-Professional Or Multidisciplinary Ind Code"),
-                RehabilitationAssessmentTeamType = csv.GetField<string>("Rehabilitation Assessment Team Type"),
-                DiagnosisSchemeInUseICD = csv.GetField<string>("Diagnosis Scheme In Use (ICD)"),
-                DiagnosisSchemeInUseRead = csv.GetField<string>("Diagnosis Scheme In Use (Read)"),
-                ProcedureSchemeInUseOPCS = csv.GetField<string>("Procedure Scheme In Use (OPCS)"),
-                ProcedureSchemeInUseREAD = csv.GetField<string>("Procedure Scheme In Use (READ)"),
-                WardCodeAtEpisodeStartDate = csv.GetField<string>("Ward Code at Episode Start Date"),
-                WardSecurityLevelAtEpisodeStartDate = csv.GetField<string>("Ward Security Level at Episode Start Date"),
-                LocationClassAtEpisodeStartDate = csv.GetField<string>("Location Class at Episode Start Date"),
-                SiteCodeOfTreatmentAtEpisodeStartDate = csv.GetField<string>("Site Code (of Treatment) At Episode Start Date"),
-                OrganisationCodeTypeSiteCodeOfTreatmentAtStartOfEpisode = csv.GetField<string>("Organisation Code Type (Site Code of Treatment) (At Start of Episode)"),
-                IntendedClinicalCareIntensityAtStartOfEpisode = csv.GetField<string>("Intended Clinical Care Intensity(At Start of Episode)"),
-                AgeGroupIntendedAtStartOfEpisode = csv.GetField<string>("Age Group Intended (At Start of Episode)"),
-                SexOfPatientsAtStartOfEpisode = csv.GetField<string>("Sex of Patients (At Start of Episode)"),
-                WardDayPeriodAvailability = csv.GetField<string>("Ward Day Period Availability"),
-                WardNightPeriodAvailability = csv.GetField<string>("Ward Night Period Availability"),
-                WardCodeAtEpisodeEndDate = csv.GetField<string>("Ward Code at Episode End Date"),
-                WardSecurityLevelAtEpisodeEndDate = csv.GetField<string>("Ward Security Level at Episode End Date"),
-                LocationClassAtEpisodeEndDate = csv.GetField<string>("Location Class at Episode End Date"),
-                SiteCodeOfTreatmentAtEpisodeEndDate = csv.GetField<string>("Site Code (of Treatment) at Episode End Date"),
-                OrganisationCodeTypeSiteCodeOfTreatmentAtEpisodeEndDate = csv.GetField<string>("Organisation Code Type Site Code (of Treatment) at Episode End Date"),
-                IntendedClinicalCareIntensityAtEpisodeEndDate = csv.GetField<string>("Intended Clinical Care Intensity at Episode End Date"),
-                AgeGroupIntendedAtEpisodeEndDate = csv.GetField<string>("Age Group Intended at Episode End Date"),
-                SexOfPatientsAtEpisodeEndDate = csv.GetField<string>("Sex of Patients at Episode End Date"),
-                WardDayPeriodAvailabilityAtEpisodeEndDate = csv.GetField<string>("Ward Day Period Availability at Episode End Date"),
-                WardNightPeriodAvailabilityAtEpisodeEndDate = csv.GetField<string>("Ward Night Period Availability at Episode End Date"),
-                GeneralMedicalPractitionerCodeofRegisteredGMP = csv.GetField<string>("General Medical Practitioner Code of Registered GMP"),
-                PracticeCodeOfRegisteredGP = csv.GetField<string>("Practice Code of Registered GP"),
-                OrganisationCodeTypeofRegisteredGP = csv.GetField<string>("Organisation Code Type of Registered GP"),
-                ReferrerCode = csv.GetField<string>("Referrer Code"),
-                ReferringOrganisationCode = csv.GetField<string>("Referring Organisation Code"),
-                OrganisationCodeTypeofReferrer = csv.GetField<string>("Organisation Code Type of Referrer"),
-                DirectAccessReferralIndicator = csv.GetField<string>("Direct Access Referral Indicator"),
-                AmbulanceIncidentNumber = csv.GetField<string>("Ambulance Incident Number"),
-                OrganisationCodeConveyingAmbulanceTrust = csv.GetField<string>("Organisation Code (Conveying Ambulance Trust)"),
-                DurationofElectiveWait = csv.GetField<string>("Duration of Elective Wait"),
-                IntendedManagement = csv.GetField<string>("Intended Management"),
-                DecidedToAdmitDateForThisProvider = csv.GetField<string>("Decided To Admit Date (For This Provider)"),
-                WaitingTimeMeasurementType = csv.GetField<string>("Waiting Time Measurement Type"),
-                LocationTypeCodeAtStartOfEpisode = csv.GetField<string>("Location Type Code at Start of Episode"),
-                HRGCode = csv.GetField<string>("HRG Code"),
-                HRGVersionNumber = csv.GetField<string>("HRG Version Number"),
-                ProcedureSchemeInUse = csv.GetField<string>("Procedure Scheme In Use"),
-                DominantGroupingVariableProcedure = csv.GetField<string>("Dominant Grouping Variable - Procedure"),
-                FCEHRG = csv.GetField<string>("FCE HRG"),
-                EpisodeHRGVersionNumber = csv.GetField<string>("Episode HRG Version Number"),
-                SpellCoreHRG = csv.GetField<string>("Spell Core HRG"),
-                SpellHRGVersionNumber = csv.GetField<string>("Spell HRG Version Number"),
-                NumberOfBabies = csv.GetField<string>("Number of Babies"),
-                FirstAntenatalAssessmentDate = csv.GetField<string>("First Antenatal Assessment Date"),
-                GMPCodeofGMPResponsibleforAntenatalCare = csv.GetField<string>("GMP (Code of GMP Responsible for Antenatal Care)"),
-                CodeofGPPracticeRegisteredGMPAntenatalCare = csv.GetField<string>("Code of GP Practice (Registered GMP- Antenatal Care)"),
-                OrganisationCodeTypeGPPracticeRegisteredGMPAntenatalCare = csv.GetField<string>("Organisation Code Type GP Practice (Registered GMP- Antenatal Care)"),
-                LocationClassOfDeliveryPlaceIntended = csv.GetField<string>("Location Class of Delivery Place (Intended)"),
-                LocationTypeofDeliveryPlaceIntended = csv.GetField<string>("Location Type of Delivery Place (Intended)"),
-                DeliveryPlaceChangeReason = csv.GetField<string>("Delivery Place Change Reason"),
-                DeliveryPlaceTypeIntended = csv.GetField<string>("Delivery Place Type (Intended)"),
-                AnaestheticGivenDuringLabourDelivery = csv.GetField<string>("Anaesthetic Given During Labour/Delivery"),
-                AnaestheticGivenPostDelivery = csv.GetField<string>("Anaesthetic Given Post Delivery"),
-                GestationLengthLabourOnset = csv.GetField<string>("Gestation Length (Labour Onset)"),
-                LabourDeliveryOnsetMethod = csv.GetField<string>("Labour/Delivery Onset Method"),
-                DeliveryDate = csv.GetField<string>("Delivery Date"),
-                GestationLengthAssessmentBaby = csv.GetField<string>("Gestation Length (Assessment) Baby"),
-                LocalPatientIdentifierMother = csv.GetField<string>("Local Patient Identifier (Mother)"),
-                OrganisationCodeLocalPatientIdentifierMother = csv.GetField<string>("Organisation Code (Local Patient Identifier (Mother))"),
-                OrganisationCodeTypeMother = csv.GetField<string>("Organisation Code Type (Mother)"),
-                NHSNumberMother = csv.GetField<string>("NHS Number (Mother)"),
-                NHSNumberStatusIndicatorMother = csv.GetField<string>("NHS Number Status Indicator (Mother)"),
-                BirthDateMother = csv.GetField<string>("Birth Date (Mother)"),
-                AddressFormatCodeMother = csv.GetField<string>("Address Format Code (Mother)"),
-                PatientUsualAddressMother = csv.GetField<string>("Patient Usual Address (Mother)"),
-                PostcodeOfUsualAddressMother = csv.GetField<string>("Postcode of Usual Address (Mother)"),
-                OrganisationCodePCTofResidenceMother = csv.GetField<string>("Organisation Code (PCT of Residence) (Mother)"),
-                OrganisationCodeTypePCTofResidenceMother = csv.GetField<string>("Organisation Code Type (PCT of Residence) (Mother)"),
-                UniqueBookingReferenceNumberConverted = csv.GetField<string>("Unique Booking Reference Number Converted"),
-                PatientPathwayIdentifier = csv.GetField<string>("Patient Pathway Identifier"),
-                OrganisationCodePatientPathwayIdentifierIssuer = csv.GetField<string>("Organisation Code Patient Pathway Identifier Issuer"),
-                ReferralToTreatmentPeriodStatus = csv.GetField<string>("Referral To Treatment Period Status"),
-                ReferralToTreatmentPeriodStartDate = csv.GetField<string>("Referral To Treatment Period Start Date"),
-                ReferralToTreatmentPeriodEndDate = csv.GetField<string>("Referral To Treatment Period End Date"),
-                LeadCareActivityIndicator = csv.GetField<string>("Lead Care Activity Indicator"),
-                AgeatCDSActivityDate = csv.GetField<string>("Age at CDS Activity Date"),
-                NHSServiceAgreementChangeDate = csv.GetField<string>("NHS Service Agreement Change Date"),
-                CDSActivityDate = csv.GetField<string>("CDS Activity Date"),
-                AgeAsOnAdmission = csv.GetField<string>("Age as on Admission"),
-                AdminCategoryAtStart = csv.GetField<string>("Admin Category at Start"),
-                HospitalProviderSpellDischargeReadyDate = csv.GetField<string>("Hospital Provider Spell Discharge Ready Date"),
-                LocationType = csv.GetField<string>("Location Type"),
-                XMLVersion = csv.GetField<string>("XML Version"),
-                ConfidentialityCategoryDerived = csv.GetField<string>("Confidentiality Category (Derived)"),
-                ReferralToTreatmentLengthDerived = csv.GetField<string>("Referral To Treatment Length (Derived)"),
-                AgeRangePatientdDerivedFromDOB = csv.GetField<string>("Age range patient derived from DOB"),
-                AgeRangeMotherDerivedFromDOB = csv.GetField<string>("Age range mother derived from DOB"),
-                AreaCodeDerivedFromPostcode = csv.GetField<string>("Area code derived from postcode."),
-                CDSGroup = csv.GetField<string>("CDS Group"),
-                FinishedIndicator = csv.GetField<string>("Finished Indicator"),
-                PCTDerivedfromGP = csv.GetField<string>("PCT (Derived from GP)"),
-                PCTTypeDerivedfromGP = csv.GetField<string>("PCT Type (Derived from GP)"),
-                GPPracticeDerived = csv.GetField<string>("GP Practice (Derived)"),
-                GPPracticeMotherDerived = csv.GetField<string>("GP Practice Mother (Derived)"),
-                PCTDerivedfromderivedGPPractice = csv.GetField<string>("PCT (Derived from derived GP Practice)"),
-                PCTMotherDerivedfromderivedGPPractice = csv.GetField<string>("PCT Mother (Derived from derived GP Practice)"),
-                SHAfromGPPractice = csv.GetField<string>("SHA from GP Practice"),
-                SHATypefromGPPractice = csv.GetField<string>("SHA Type from GP Practice"),
-                HospitalSpellDuration = csv.GetField<string>("Hospital Spell Duration"),
-                MonthOfBirth = csv.GetField<string>("Month of Birth"),
-                HomeBirthOrDelivery = csv.GetField<string>("Home Birth or Delivery"),
-                ElectoralWardFromPostcode = csv.GetField<string>("Electoral Ward from postcode"),
-                PCTFromPostcode = csv.GetField<string>("PCT from postcode"),
-                PCTTypefromPostcode = csv.GetField<string>("PCT Type from Postcode"),
-                SHAfromPostcode = csv.GetField<string>("SHA from Postcode"),
-                SHATypefromPostcode = csv.GetField<string>("SHA Type from Postcode"),
-                AreacodeFromProviderPostcode = csv.GetField<string>("Area code from Provider Postcode"),
-                AgeAtEndOfEpisode = csv.GetField<string>("Age at End of Episode"),
-                AgeAtStartOfEpisode = csv.GetField<string>("Age at Start of Episode"),
-                YearOfBirth = csv.GetField<string>("Year of Birth"),
-                YearOfBirthMother = csv.GetField<string>("Year of Birth Mother"),
-                MonthOfBirthMother = csv.GetField<string>("Month of Birth Mother"),
-                CensusArea = csv.GetField<string>("2001 Census Area"),
-                Country = csv.GetField<string>("Country"),
-                CountyCode = csv.GetField<string>("County Code"),
-                CensusED = csv.GetField<string>("1991 Census ED"),
-                EDDistrictCode = csv.GetField<string>("ED District Code"),
-                ElectoralWardCode = csv.GetField<string>("Electoral Ward Code"),
-                GORCode = csv.GetField<string>("GOR Code"),
-                LocalUnitaryAuthority = csv.GetField<string>("Local Unitary Authority"),
-                OldSHACode = csv.GetField<string>("Old SHA Code"),
-                ElectoralArea = csv.GetField<string>("1998 Electoral Area"),
-                PrimeRecipient = csv.GetField<string>("Prime Recipient"),
-                CopyRecipients = csv.GetField<string>("Copy Recipients"),
+                GeneratedRecordIdentifier = csv.GetField<string>("Generated Record Identifier").GetTrimmedValueOrNull(),
+                PBRSpellID = csv.GetField<string>("PBR Spell ID").GetTrimmedValueOrNull(),
+                ReasonForAccess = csv.GetField<string>("Reason for Access").GetTrimmedValueOrNull(),
+                CDSType = csv.GetField<string>("CDS type").GetTrimmedValueOrNull(),
+                ProtocolIdentifier = csv.GetField<string>("Protocol identifier").GetTrimmedValueOrNull(),
+                UniqueCDSIdentifier = csv.GetField<string>("Unique CDS identifier").GetTrimmedValueOrNull(),
+                UpdateType = csv.GetField<string>("Update type").GetTrimmedValueOrNull(),
+                BulkReplacementCDSGroup = csv.GetField<string>("Bulk replacement CDS group").GetTrimmedValueOrNull(),
+                TestIndicator = csv.GetField<string>("Test indicator").GetTrimmedValueOrNull(),
+                ApplicableDatetime = csv.GetField<string>("Applicable date/time").GetTrimmedValueOrNull(),
+                CensusDate = csv.GetField<string>("Census date").GetTrimmedValueOrNull(),
+                ExtractDatetime = csv.GetField<string>("Extract date/time").GetTrimmedValueOrNull(),
+                ReportPeriodStartDate = csv.GetField<string>("Report period Start Date").GetTrimmedValueOrNull(),
+                ReportPeriodEndDate = csv.GetField<string>("Report period End Date").GetTrimmedValueOrNull(),
+                OrganisationCodeSenderOfTransaction = csv.GetField<string>("Organisation code: Sender of transaction").GetTrimmedValueOrNull(),
+                OrganisationCodeTypeofSender = csv.GetField<string>("Organisation Code Type of Sender").GetTrimmedValueOrNull(),
+                SubmissionDate = csv.GetField<string>("Submission Date").GetTrimmedValueOrNull(),
+                CDSInterchangeID = csv.GetField<string>("CDS Interchange ID").GetTrimmedValueOrNull(),
+                LocalPatientIdentifier = csv.GetField<string>("Local Patient Identifier").GetTrimmedValueOrNull(),
+                OrganisationCodeLocalPatientIdentifier = csv.GetField<string>("Organisation Code (Local Patient Identifier)").GetTrimmedValueOrNull(),
+                OrganisationCodeTypeLocalPatientIdentifier = csv.GetField<string>("Organisation Code Type (Local Patient Identifier)").GetTrimmedValueOrNull(),
+                NHSNumber = csv.GetField<string>("NHS Number").GetTrimmedValueOrNull(),
+                DateofBirth = csv.GetField<string>("Date of Birth").GetTrimmedValueOrNull(),
+                BirthWeight = csv.GetField<string>("Birth Weight").GetTrimmedValueOrNull(),
+                LiveOrStillBirth = csv.GetField<string>("Live or Still Birth").GetTrimmedValueOrNull(),
+                CarerSupportIndicator = csv.GetField<string>("Carer Support Indicator").GetTrimmedValueOrNull(),
+                LegalStatusClassificationOnAdmissionPsychiatricCensusOnly = csv.GetField<string>("Legal Status Classification on Admission (Psychiatric Census Only)").GetTrimmedValueOrNull(),
+                EthnicGroup = csv.GetField<string>("Ethnic Group").GetTrimmedValueOrNull(),
+                MaritalStatusPsychiatricCensusOnly = csv.GetField<string>("Marital Status (Psychiatric Census Only)").GetTrimmedValueOrNull(),
+                NHSNumberTraceStatus = csv.GetField<string>("NHS Number Trace Status").GetTrimmedValueOrNull(),
+                WithheldIdentityReason = csv.GetField<string>("Withheld Identity Reason").GetTrimmedValueOrNull(),
+                Sex = csv.GetField<string>("Sex").GetTrimmedValueOrNull(),
+                PregnancyTotalPreviousPregnancies = csv.GetField<string>("Pregnancy Total Previous Pregnancies").GetTrimmedValueOrNull(),
+                NameFormatCode = csv.GetField<string>("Name Format Code").GetTrimmedValueOrNull(),
+                PatientName = csv.GetField<string>("Patient Name").GetTrimmedValueOrNull(),
+                PersonTitle = csv.GetField<string>("Person Title").GetTrimmedValueOrNull(),
+                PersonGivenName = csv.GetField<string>("Person Given Name").GetTrimmedValueOrNull(),
+                PersonFamilyName = csv.GetField<string>("Person Family Name").GetTrimmedValueOrNull(),
+                PersonNameSuffix = csv.GetField<string>("Person Name Suffix").GetTrimmedValueOrNull(),
+                PersonInitials = csv.GetField<string>("Person Initials").GetTrimmedValueOrNull(),
+                AddressFormatCode = csv.GetField<string>("Address Format Code").GetTrimmedValueOrNull(),
+                PatientUsualAddress = csv.GetField<string>("Patient Usual Address").GetTrimmedValueOrNull(),
+                Postcode = csv.GetField<string>("Postcode").GetTrimmedValueOrNull(),
+                OrganisationCodeResidenceResponsibility = csv.GetField<string>("Organisation Code (Residence Responsibility)").GetTrimmedValueOrNull(),
+                PCTofResidence = csv.GetField<string>("PCT of Residence").GetTrimmedValueOrNull(),
+                OrganisationCodeTypePCTofResidence = csv.GetField<string>("Organisation Code Type (PCT of Residence)").GetTrimmedValueOrNull(),
+                OSVClassificationatCDSActivityDate = csv.GetField<string>("OSV Classification at CDS Activity Date").GetTrimmedValueOrNull(),
+                HospitalProviderSpellNumber = csv.GetField<string>("Hospital Provider Spell Number").GetTrimmedValueOrNull(),
+                AdministrativeCategory = csv.GetField<string>("Administrative Category").GetTrimmedValueOrNull(),
+                PatientClassification = csv.GetField<string>("Patient Classification").GetTrimmedValueOrNull(),
+                AdmissionMethodHospitalProviderSpell = csv.GetField<string>("Admission Method (Hospital Provider Spell)").GetTrimmedValueOrNull(),
+                DischargeDestinationHospitalProviderSpell = csv.GetField<string>("Discharge Destination (Hospital Provider Spell)").GetTrimmedValueOrNull(),
+                DischargeMethodHospitalProviderSpell = csv.GetField<string>("Discharge Method (Hospital Provider Spell)").GetTrimmedValueOrNull(),
+                SourceOfAdmissionHospitalProviderSpell = csv.GetField<string>("Source of Admission (Hospital Provider Spell)").GetTrimmedValueOrNull(),
+                StartDateHospitalProviderSpell = csv.GetField<string>("Start Date (Hospital Provider Spell)").GetTrimmedValueOrNull(),
+                StartTimeHospitalProviderSpell = csv.GetField<string>("Start Time (Hospital Provider Spell)").GetTrimmedValueOrNull(),
+                DischargeDateFromHospitalProviderSpell = csv.GetField<string>("Discharge Date (From Hospital Provider Spell)").GetTrimmedValueOrNull(),
+                DischargeTimeHospitalProviderSpell = csv.GetField<string>("Discharge Time (Hospital Provider Spell)").GetTrimmedValueOrNull(),
+                DischargeToHospitalAtHomeServiceIndicator = csv.GetField<string>("Discharge To Hospital At Home Service Indicator").GetTrimmedValueOrNull(),
+                EpisodeNumber = csv.GetField<string>("Episode Number").GetTrimmedValueOrNull(),
+                FirstRegularDayNightAdmission = csv.GetField<string>("First Regular Day Night Admission").GetTrimmedValueOrNull(),
+                LastEpisodeInSpellIndicator = csv.GetField<string>("Last Episode In Spell Indicator").GetTrimmedValueOrNull(),
+                NeonatalLevelOfCare = csv.GetField<string>("Neonatal Level of Care").GetTrimmedValueOrNull(),
+                OperationStatus = csv.GetField<string>("Operation Status").GetTrimmedValueOrNull(),
+                PsychiatricPatientStatus = csv.GetField<string>("Psychiatric Patient Status").GetTrimmedValueOrNull(),
+                StartDateConsultantEpisode = csv.GetField<string>("Start Date (Consultant Episode)").GetTrimmedValueOrNull(),
+                StartTimeEpisode = csv.GetField<string>("Start Time (Episode)").GetTrimmedValueOrNull(),
+                EndDateConsultantEpisode = csv.GetField<string>("End Date (Consultant Episode)").GetTrimmedValueOrNull(),
+                EndTimeEpisode = csv.GetField<string>("End Time (Episode)").GetTrimmedValueOrNull(),
+                LengthOfStayAdjustmentRehabilitation = csv.GetField<string>("Length Of Stay Adjustment (Rehabilitation)").GetTrimmedValueOrNull(),
+                LengthOfStayAdjustmentSpecialistPalliativeCare = csv.GetField<string>("Length Of Stay Adjustment (Specialist Palliative Care)").GetTrimmedValueOrNull(),
+                CommissioningSerialNumber = csv.GetField<string>("Commissioning Serial Number").GetTrimmedValueOrNull(),
+                NHSServiceAgreementLineNumber = csv.GetField<string>("NHS Service Agreement Line Number").GetTrimmedValueOrNull(),
+                ProviderReferenceNumber = csv.GetField<string>("Provider Reference Number").GetTrimmedValueOrNull(),
+                CommissionerReferenceNumber = csv.GetField<string>("Commissioner Reference Number").GetTrimmedValueOrNull(),
+                OrganisationCodeCodeOfProvider = csv.GetField<string>("Organisation Code Code of Provider").GetTrimmedValueOrNull(),
+                OrganisationCodeTypeOfProvider = csv.GetField<string>("Organisation Code Type of Provider").GetTrimmedValueOrNull(),
+                OrganisationCodeCodeOfCommissioner = csv.GetField<string>("Organisation Code Code of Commissioner").GetTrimmedValueOrNull(),
+                OrganisationCodeTypeofCommissioner = csv.GetField<string>("Organisation Code Type of Commissioner").GetTrimmedValueOrNull(),
+                ConsultantCode = csv.GetField<string>("Consultant Code").GetTrimmedValueOrNull(),
+                MainSpecialtyCode = csv.GetField<string>("Main Specialty Code").GetTrimmedValueOrNull(),
+                TreatmentFunctionCode = csv.GetField<string>("Treatment Function Code").GetTrimmedValueOrNull(),
+                LocalSubSpecialtyCode = csv.GetField<string>("Local Sub Specialty Code").GetTrimmedValueOrNull(),
+                MultiProfessionalOrMultidisciplinaryIndCode = csv.GetField<string>("Multi-Professional Or Multidisciplinary Ind Code").GetTrimmedValueOrNull(),
+                RehabilitationAssessmentTeamType = csv.GetField<string>("Rehabilitation Assessment Team Type").GetTrimmedValueOrNull(),
+                DiagnosisSchemeInUseICD = csv.GetField<string>("Diagnosis Scheme In Use (ICD)").GetTrimmedValueOrNull(),
+                DiagnosisSchemeInUseRead = csv.GetField<string>("Diagnosis Scheme In Use (Read)").GetTrimmedValueOrNull(),
+                ProcedureSchemeInUseOPCS = csv.GetField<string>("Procedure Scheme In Use (OPCS)").GetTrimmedValueOrNull(),
+                ProcedureSchemeInUseREAD = csv.GetField<string>("Procedure Scheme In Use (READ)").GetTrimmedValueOrNull(),
+                WardCodeAtEpisodeStartDate = csv.GetField<string>("Ward Code at Episode Start Date").GetTrimmedValueOrNull(),
+                WardSecurityLevelAtEpisodeStartDate = csv.GetField<string>("Ward Security Level at Episode Start Date").GetTrimmedValueOrNull(),
+                LocationClassAtEpisodeStartDate = csv.GetField<string>("Location Class at Episode Start Date").GetTrimmedValueOrNull(),
+                SiteCodeOfTreatmentAtEpisodeStartDate = csv.GetField<string>("Site Code (of Treatment) At Episode Start Date").GetTrimmedValueOrNull(),
+                OrganisationCodeTypeSiteCodeOfTreatmentAtStartOfEpisode = csv.GetField<string>("Organisation Code Type (Site Code of Treatment) (At Start of Episode)").GetTrimmedValueOrNull(),
+                IntendedClinicalCareIntensityAtStartOfEpisode = csv.GetField<string>("Intended Clinical Care Intensity(At Start of Episode)").GetTrimmedValueOrNull(),
+                AgeGroupIntendedAtStartOfEpisode = csv.GetField<string>("Age Group Intended (At Start of Episode)").GetTrimmedValueOrNull(),
+                SexOfPatientsAtStartOfEpisode = csv.GetField<string>("Sex of Patients (At Start of Episode)").GetTrimmedValueOrNull(),
+                WardDayPeriodAvailability = csv.GetField<string>("Ward Day Period Availability").GetTrimmedValueOrNull(),
+                WardNightPeriodAvailability = csv.GetField<string>("Ward Night Period Availability").GetTrimmedValueOrNull(),
+                WardCodeAtEpisodeEndDate = csv.GetField<string>("Ward Code at Episode End Date").GetTrimmedValueOrNull(),
+                WardSecurityLevelAtEpisodeEndDate = csv.GetField<string>("Ward Security Level at Episode End Date").GetTrimmedValueOrNull(),
+                LocationClassAtEpisodeEndDate = csv.GetField<string>("Location Class at Episode End Date").GetTrimmedValueOrNull(),
+                SiteCodeOfTreatmentAtEpisodeEndDate = csv.GetField<string>("Site Code (of Treatment) at Episode End Date").GetTrimmedValueOrNull(),
+                OrganisationCodeTypeSiteCodeOfTreatmentAtEpisodeEndDate = csv.GetField<string>("Organisation Code Type Site Code (of Treatment) at Episode End Date").GetTrimmedValueOrNull(),
+                IntendedClinicalCareIntensityAtEpisodeEndDate = csv.GetField<string>("Intended Clinical Care Intensity at Episode End Date").GetTrimmedValueOrNull(),
+                AgeGroupIntendedAtEpisodeEndDate = csv.GetField<string>("Age Group Intended at Episode End Date").GetTrimmedValueOrNull(),
+                SexOfPatientsAtEpisodeEndDate = csv.GetField<string>("Sex of Patients at Episode End Date").GetTrimmedValueOrNull(),
+                WardDayPeriodAvailabilityAtEpisodeEndDate = csv.GetField<string>("Ward Day Period Availability at Episode End Date").GetTrimmedValueOrNull(),
+                WardNightPeriodAvailabilityAtEpisodeEndDate = csv.GetField<string>("Ward Night Period Availability at Episode End Date").GetTrimmedValueOrNull(),
+                GeneralMedicalPractitionerCodeofRegisteredGMP = csv.GetField<string>("General Medical Practitioner Code of Registered GMP").GetTrimmedValueOrNull(),
+                PracticeCodeOfRegisteredGP = csv.GetField<string>("Practice Code of Registered GP").GetTrimmedValueOrNull(),
+                OrganisationCodeTypeofRegisteredGP = csv.GetField<string>("Organisation Code Type of Registered GP").GetTrimmedValueOrNull(),
+                ReferrerCode = csv.GetField<string>("Referrer Code").GetTrimmedValueOrNull(),
+                ReferringOrganisationCode = csv.GetField<string>("Referring Organisation Code").GetTrimmedValueOrNull(),
+                OrganisationCodeTypeofReferrer = csv.GetField<string>("Organisation Code Type of Referrer").GetTrimmedValueOrNull(),
+                DirectAccessReferralIndicator = csv.GetField<string>("Direct Access Referral Indicator").GetTrimmedValueOrNull(),
+                AmbulanceIncidentNumber = csv.GetField<string>("Ambulance Incident Number").GetTrimmedValueOrNull(),
+                OrganisationCodeConveyingAmbulanceTrust = csv.GetField<string>("Organisation Code (Conveying Ambulance Trust)").GetTrimmedValueOrNull(),
+                DurationofElectiveWait = csv.GetField<string>("Duration of Elective Wait").GetTrimmedValueOrNull(),
+                IntendedManagement = csv.GetField<string>("Intended Management").GetTrimmedValueOrNull(),
+                DecidedToAdmitDateForThisProvider = csv.GetField<string>("Decided To Admit Date (For This Provider)").GetTrimmedValueOrNull(),
+                WaitingTimeMeasurementType = csv.GetField<string>("Waiting Time Measurement Type").GetTrimmedValueOrNull(),
+                LocationTypeCodeAtStartOfEpisode = csv.GetField<string>("Location Type Code at Start of Episode").GetTrimmedValueOrNull(),
+                HRGCode = csv.GetField<string>("HRG Code").GetTrimmedValueOrNull(),
+                HRGVersionNumber = csv.GetField<string>("HRG Version Number").GetTrimmedValueOrNull(),
+                ProcedureSchemeInUse = csv.GetField<string>("Procedure Scheme In Use").GetTrimmedValueOrNull(),
+                DominantGroupingVariableProcedure = csv.GetField<string>("Dominant Grouping Variable - Procedure").GetTrimmedValueOrNull(),
+                FCEHRG = csv.GetField<string>("FCE HRG").GetTrimmedValueOrNull(),
+                EpisodeHRGVersionNumber = csv.GetField<string>("Episode HRG Version Number").GetTrimmedValueOrNull(),
+                SpellCoreHRG = csv.GetField<string>("Spell Core HRG").GetTrimmedValueOrNull(),
+                SpellHRGVersionNumber = csv.GetField<string>("Spell HRG Version Number").GetTrimmedValueOrNull(),
+                NumberOfBabies = csv.GetField<string>("Number of Babies").GetTrimmedValueOrNull(),
+                FirstAntenatalAssessmentDate = csv.GetField<string>("First Antenatal Assessment Date").GetTrimmedValueOrNull(),
+                GMPCodeofGMPResponsibleforAntenatalCare = csv.GetField<string>("GMP (Code of GMP Responsible for Antenatal Care)").GetTrimmedValueOrNull(),
+                CodeofGPPracticeRegisteredGMPAntenatalCare = csv.GetField<string>("Code of GP Practice (Registered GMP- Antenatal Care)").GetTrimmedValueOrNull(),
+                OrganisationCodeTypeGPPracticeRegisteredGMPAntenatalCare = csv.GetField<string>("Organisation Code Type GP Practice (Registered GMP- Antenatal Care)").GetTrimmedValueOrNull(),
+                LocationClassOfDeliveryPlaceIntended = csv.GetField<string>("Location Class of Delivery Place (Intended)").GetTrimmedValueOrNull(),
+                LocationTypeofDeliveryPlaceIntended = csv.GetField<string>("Location Type of Delivery Place (Intended)").GetTrimmedValueOrNull(),
+                DeliveryPlaceChangeReason = csv.GetField<string>("Delivery Place Change Reason").GetTrimmedValueOrNull(),
+                DeliveryPlaceTypeIntended = csv.GetField<string>("Delivery Place Type (Intended)").GetTrimmedValueOrNull(),
+                AnaestheticGivenDuringLabourDelivery = csv.GetField<string>("Anaesthetic Given During Labour/Delivery").GetTrimmedValueOrNull(),
+                AnaestheticGivenPostDelivery = csv.GetField<string>("Anaesthetic Given Post Delivery").GetTrimmedValueOrNull(),
+                GestationLengthLabourOnset = csv.GetField<string>("Gestation Length (Labour Onset)").GetTrimmedValueOrNull(),
+                LabourDeliveryOnsetMethod = csv.GetField<string>("Labour/Delivery Onset Method").GetTrimmedValueOrNull(),
+                DeliveryDate = csv.GetField<string>("Delivery Date").GetTrimmedValueOrNull(),
+                GestationLengthAssessmentBaby = csv.GetField<string>("Gestation Length (Assessment) Baby").GetTrimmedValueOrNull(),
+                LocalPatientIdentifierMother = csv.GetField<string>("Local Patient Identifier (Mother)").GetTrimmedValueOrNull(),
+                OrganisationCodeLocalPatientIdentifierMother = csv.GetField<string>("Organisation Code (Local Patient Identifier (Mother))").GetTrimmedValueOrNull(),
+                OrganisationCodeTypeMother = csv.GetField<string>("Organisation Code Type (Mother)").GetTrimmedValueOrNull(),
+                NHSNumberMother = csv.GetField<string>("NHS Number (Mother)").GetTrimmedValueOrNull(),
+                NHSNumberStatusIndicatorMother = csv.GetField<string>("NHS Number Status Indicator (Mother)").GetTrimmedValueOrNull(),
+                BirthDateMother = csv.GetField<string>("Birth Date (Mother)").GetTrimmedValueOrNull(),
+                AddressFormatCodeMother = csv.GetField<string>("Address Format Code (Mother)").GetTrimmedValueOrNull(),
+                PatientUsualAddressMother = csv.GetField<string>("Patient Usual Address (Mother)").GetTrimmedValueOrNull(),
+                PostcodeOfUsualAddressMother = csv.GetField<string>("Postcode of Usual Address (Mother)").GetTrimmedValueOrNull(),
+                OrganisationCodePCTofResidenceMother = csv.GetField<string>("Organisation Code (PCT of Residence) (Mother)").GetTrimmedValueOrNull(),
+                OrganisationCodeTypePCTofResidenceMother = csv.GetField<string>("Organisation Code Type (PCT of Residence) (Mother)").GetTrimmedValueOrNull(),
+                UniqueBookingReferenceNumberConverted = csv.GetField<string>("Unique Booking Reference Number Converted").GetTrimmedValueOrNull(),
+                PatientPathwayIdentifier = csv.GetField<string>("Patient Pathway Identifier").GetTrimmedValueOrNull(),
+                OrganisationCodePatientPathwayIdentifierIssuer = csv.GetField<string>("Organisation Code Patient Pathway Identifier Issuer").GetTrimmedValueOrNull(),
+                ReferralToTreatmentPeriodStatus = csv.GetField<string>("Referral To Treatment Period Status").GetTrimmedValueOrNull(),
+                ReferralToTreatmentPeriodStartDate = csv.GetField<string>("Referral To Treatment Period Start Date").GetTrimmedValueOrNull(),
+                ReferralToTreatmentPeriodEndDate = csv.GetField<string>("Referral To Treatment Period End Date").GetTrimmedValueOrNull(),
+                LeadCareActivityIndicator = csv.GetField<string>("Lead Care Activity Indicator").GetTrimmedValueOrNull(),
+                AgeatCDSActivityDate = csv.GetField<string>("Age at CDS Activity Date").GetTrimmedValueOrNull(),
+                NHSServiceAgreementChangeDate = csv.GetField<string>("NHS Service Agreement Change Date").GetTrimmedValueOrNull(),
+                CDSActivityDate = csv.GetField<string>("CDS Activity Date").GetTrimmedValueOrNull(),
+                AgeAsOnAdmission = csv.GetField<string>("Age as on Admission").GetTrimmedValueOrNull(),
+                AdminCategoryAtStart = csv.GetField<string>("Admin Category at Start").GetTrimmedValueOrNull(),
+                HospitalProviderSpellDischargeReadyDate = csv.GetField<string>("Hospital Provider Spell Discharge Ready Date").GetTrimmedValueOrNull(),
+                LocationType = csv.GetField<string>("Location Type").GetTrimmedValueOrNull(),
+                XMLVersion = csv.GetField<string>("XML Version").GetTrimmedValueOrNull(),
+                ConfidentialityCategoryDerived = csv.GetField<string>("Confidentiality Category (Derived)").GetTrimmedValueOrNull(),
+                ReferralToTreatmentLengthDerived = csv.GetField<string>("Referral To Treatment Length (Derived)").GetTrimmedValueOrNull(),
+                AgeRangePatientdDerivedFromDOB = csv.GetField<string>("Age range patient derived from DOB").GetTrimmedValueOrNull(),
+                AgeRangeMotherDerivedFromDOB = csv.GetField<string>("Age range mother derived from DOB").GetTrimmedValueOrNull(),
+                AreaCodeDerivedFromPostcode = csv.GetField<string>("Area code derived from postcode.").GetTrimmedValueOrNull(),
+                CDSGroup = csv.GetField<string>("CDS Group").GetTrimmedValueOrNull(),
+                FinishedIndicator = csv.GetField<string>("Finished Indicator").GetTrimmedValueOrNull(),
+                PCTDerivedfromGP = csv.GetField<string>("PCT (Derived from GP)").GetTrimmedValueOrNull(),
+                PCTTypeDerivedfromGP = csv.GetField<string>("PCT Type (Derived from GP)").GetTrimmedValueOrNull(),
+                GPPracticeDerived = csv.GetField<string>("GP Practice (Derived)").GetTrimmedValueOrNull(),
+                GPPracticeMotherDerived = csv.GetField<string>("GP Practice Mother (Derived)").GetTrimmedValueOrNull(),
+                PCTDerivedfromderivedGPPractice = csv.GetField<string>("PCT (Derived from derived GP Practice)").GetTrimmedValueOrNull(),
+                PCTMotherDerivedfromderivedGPPractice = csv.GetField<string>("PCT Mother (Derived from derived GP Practice)").GetTrimmedValueOrNull(),
+                SHAfromGPPractice = csv.GetField<string>("SHA from GP Practice").GetTrimmedValueOrNull(),
+                SHATypefromGPPractice = csv.GetField<string>("SHA Type from GP Practice").GetTrimmedValueOrNull(),
+                HospitalSpellDuration = csv.GetField<string>("Hospital Spell Duration").GetTrimmedValueOrNull(),
+                MonthOfBirth = csv.GetField<string>("Month of Birth").GetTrimmedValueOrNull(),
+                HomeBirthOrDelivery = csv.GetField<string>("Home Birth or Delivery").GetTrimmedValueOrNull(),
+                ElectoralWardFromPostcode = csv.GetField<string>("Electoral Ward from postcode").GetTrimmedValueOrNull(),
+                PCTFromPostcode = csv.GetField<string>("PCT from postcode").GetTrimmedValueOrNull(),
+                PCTTypefromPostcode = csv.GetField<string>("PCT Type from Postcode").GetTrimmedValueOrNull(),
+                SHAfromPostcode = csv.GetField<string>("SHA from Postcode").GetTrimmedValueOrNull(),
+                SHATypefromPostcode = csv.GetField<string>("SHA Type from Postcode").GetTrimmedValueOrNull(),
+                AreacodeFromProviderPostcode = csv.GetField<string>("Area code from Provider Postcode").GetTrimmedValueOrNull(),
+                AgeAtEndOfEpisode = csv.GetField<string>("Age at End of Episode").GetTrimmedValueOrNull(),
+                AgeAtStartOfEpisode = csv.GetField<string>("Age at Start of Episode").GetTrimmedValueOrNull(),
+                YearOfBirth = csv.GetField<string>("Year of Birth").GetTrimmedValueOrNull(),
+                YearOfBirthMother = csv.GetField<string>("Year of Birth Mother").GetTrimmedValueOrNull(),
+                MonthOfBirthMother = csv.GetField<string>("Month of Birth Mother").GetTrimmedValueOrNull(),
+                CensusArea = csv.GetField<string>("2001 Census Area").GetTrimmedValueOrNull(),
+                Country = csv.GetField<string>("Country").GetTrimmedValueOrNull(),
+                CountyCode = csv.GetField<string>("County Code").GetTrimmedValueOrNull(),
+                CensusED = csv.GetField<string>("1991 Census ED").GetTrimmedValueOrNull(),
+                EDDistrictCode = csv.GetField<string>("ED District Code").GetTrimmedValueOrNull(),
+                ElectoralWardCode = csv.GetField<string>("Electoral Ward Code").GetTrimmedValueOrNull(),
+                GORCode = csv.GetField<string>("GOR Code").GetTrimmedValueOrNull(),
+                LocalUnitaryAuthority = csv.GetField<string>("Local Unitary Authority").GetTrimmedValueOrNull(),
+                OldSHACode = csv.GetField<string>("Old SHA Code").GetTrimmedValueOrNull(),
+                ElectoralArea = csv.GetField<string>("1998 Electoral Area").GetTrimmedValueOrNull(),
+                PrimeRecipient = csv.GetField<string>("Prime Recipient").GetTrimmedValueOrNull(),
+                CopyRecipients = csv.GetField<string>("Copy Recipients").GetTrimmedValueOrNull(),
             };
 
             int index = 46;
diff --git a/OmopTransformer/StringExtensions.cs b/OmopTransformer/StringExtensions.cs
index 9e9705e..f60d6ba 100644
--- a/OmopTransformer/StringExtensions.cs
+++ b/OmopTransformer/StringExtensions.cs
@@ -35,6 +35,8 @@ public static bool IsEmpty(this string text)
     {
         text = text.TrimWhitespace();
 
+        text = text?.TrimEnd(new char[] { '\r', '\n' }) ?? null;
+
         if (string.IsNullOrEmpty(text))
             return null;
 
diff --git a/OmopTransformerTests/Transformation/StringExtensionsTest.cs b/OmopTransformerTests/Transformation/StringExtensionsTest.cs
new file mode 100644
index 0000000..ed8a0b9
--- /dev/null
+++ b/OmopTransformerTests/Transformation/StringExtensionsTest.cs
@@ -0,0 +1,61 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using OmopTransformer;
+
+[TestClass]
+public class StringExtensionsTests
+{
+    [TestMethod]
+    public void SubstringOrNull_ValidInput_ReturnsCorrectSubstring()
+    {
+        string text = "Hello World";
+        var result = text.SubstringOrNull(1, 5);
+        Assert.AreEqual("ello", result);
+    }
+
+    [TestMethod]
+    public void SubstringOrNull_WhitespaceOnly_ReturnsNull()
+    {
+        string text = "    ";
+        var result = text.SubstringOrNull(1, 2);
+        Assert.IsNull(result);
+    }
+
+    [TestMethod]
+    [ExpectedException(typeof(ArgumentNullException))]
+    public void SubstringOrNull_NullInput_ThrowsArgumentNullException()
+    {
+        string text = null;
+        text.SubstringOrNull(0, 1);
+    }
+
+    [DataTestMethod]
+    [DataRow("", true)]
+    [DataRow("   ", true)]
+    [DataRow("hello", false)]
+    [DataRow(" hello ", false)]
+    public void IsEmpty_ReturnsExpectedResult(string input, bool expected)
+    {
+        Assert.AreEqual(expected, input.IsEmpty());
+    }
+
+    [DataTestMethod]
+    [DataRow("  test  ", "test")]
+    [DataRow(null, null)]
+    [DataRow("", "")]
+    public void TrimWhitespace_ReturnsExpectedResult(string input, string expected)
+    {
+        Assert.AreEqual(expected, input.TrimWhitespace());
+    }
+
+    [DataTestMethod]
+    [DataRow("hello\r\n", "hello")]
+    [DataRow("\r\nhello\r\n", "\r\nhello")]
+    [DataRow("hello\r\nworld", "hello\r\nworld")]
+    [DataRow(null, null)]
+    [DataRow("", null)]
+    [DataRow("\r\n", null)]
+    public void GetTrimmedValueOrNull_ReturnsExpectedResult(string input, string expected)
+    {
+        Assert.AreEqual(expected, input.GetTrimmedValueOrNull());
+    }
+}
\ No newline at end of file