diff --git a/ConvertErrors.log b/ConvertErrors.log
index b0ac1706..fe12ec96 100644
--- a/ConvertErrors.log
+++ b/ConvertErrors.log
@@ -48,144 +48,149 @@ W19) Link to unknown for hl concept map_ orderstatus sheetcsv: ConceptMap-table
W20) mappings/codesystems/HL7 Concept Map_ OrderStatus - Sheet1.csv does not have any FHIR Mapping Content
at mappings/codesystems/HL7 Concept Map_ OrderStatus - Sheet1.csv(:1)
near: HL7 v2,,,Condition (IF TRUE),,,HL7 FHIR,,
-W21) Link to unknown for hl concept map_ planid sheetcsv: ConceptMap-table-planid-to-unknown.html
+W21) Link to unknown for hl concept map_ participantorganizationunittype sheetcsv: ConceptMap-table-hl70406-to-unknown.html
+ at mappings/codesystems/HL7 Concept Map_ ParticipantOrganizationUnitType - Sheet1.csv(:0)
+W22) mappings/codesystems/HL7 Concept Map_ ParticipantOrganizationUnitType - Sheet1.csv does not have any FHIR Mapping Content
+ at mappings/codesystems/HL7 Concept Map_ ParticipantOrganizationUnitType - Sheet1.csv(:1)
+ near: HL7 v2,,,Condition (IF TRUE),,HL7 FHIR,,
+W23) Link to unknown for hl concept map_ planid sheetcsv: ConceptMap-table-planid-to-unknown.html
at mappings/codesystems/HL7 Concept Map_ PlanId - Sheet1.csv(:0)
-W22) mappings/codesystems/HL7 Concept Map_ PlanId - Sheet1.csv does not have any FHIR Mapping Content
+W24) mappings/codesystems/HL7 Concept Map_ PlanId - Sheet1.csv does not have any FHIR Mapping Content
at mappings/codesystems/HL7 Concept Map_ PlanId - Sheet1.csv(:1)
near: HL7 v2,,,Condition (IF True),,,HL7 FHIR,,,,,Comments
-W23) Link to unknown for hl concept map_ practitioneridnumbertype sheetcsv: ConceptMap-table-hl70338-to-unknown.html
+W25) Link to unknown for hl concept map_ practitioneridnumbertype sheetcsv: ConceptMap-table-hl70338-to-unknown.html
at mappings/codesystems/HL7 Concept Map_ PractitionerIDNumberType - Sheet1.csv(:0)
-W24) mappings/codesystems/HL7 Concept Map_ PractitionerIDNumberType - Sheet1.csv does not have any FHIR Mapping Content
+W26) mappings/codesystems/HL7 Concept Map_ PractitionerIDNumberType - Sheet1.csv does not have any FHIR Mapping Content
at mappings/codesystems/HL7 Concept Map_ PractitionerIDNumberType - Sheet1.csv(:1)
near: HL7 v2,,,Condition (IF TRUE),,,HL7 FHIR,,
-W25) Link to unknown for hl concept map_ primarylanguage sheetcsv: ConceptMap-table-primarylanguage-to-unknown.html
+W27) Link to unknown for hl concept map_ primarylanguage sheetcsv: ConceptMap-table-primarylanguage-to-unknown.html
at mappings/codesystems/HL7 Concept Map_ PrimaryLanguage - Sheet1.csv(:0)
-W26) mappings/codesystems/HL7 Concept Map_ PrimaryLanguage - Sheet1.csv does not have any FHIR Mapping Content
+W28) mappings/codesystems/HL7 Concept Map_ PrimaryLanguage - Sheet1.csv does not have any FHIR Mapping Content
at mappings/codesystems/HL7 Concept Map_ PrimaryLanguage - Sheet1.csv(:1)
near: HL7 v2,,,Condition (IF True),,,HL7 FHIR,,,,,Comments
-W27) Link to unknown for hl concept map_ principallanguageofmessage sheetcsv: ConceptMap-table-principallanguageofmessage-to-unknown.html
+W29) Link to unknown for hl concept map_ principallanguageofmessage sheetcsv: ConceptMap-table-principallanguageofmessage-to-unknown.html
at mappings/codesystems/HL7 Concept Map_ PrincipalLanguageOfMessage - Sheet1.csv(:0)
-W28) mappings/codesystems/HL7 Concept Map_ PrincipalLanguageOfMessage - Sheet1.csv does not have any FHIR Mapping Content
+W30) mappings/codesystems/HL7 Concept Map_ PrincipalLanguageOfMessage - Sheet1.csv does not have any FHIR Mapping Content
at mappings/codesystems/HL7 Concept Map_ PrincipalLanguageOfMessage - Sheet1.csv(:1)
near: HL7 v2,,,Condition (IF True),,,HL7 FHIR,,,,,Comments
-W29) Link to unknown for hl concept map_ processingid sheetcsv: ConceptMap-table-hl70103-to-unknown.html
+W31) Link to unknown for hl concept map_ processingid sheetcsv: ConceptMap-table-hl70103-to-unknown.html
at mappings/codesystems/HL7 Concept Map_ ProcessingID - Sheet1.csv(:0)
-W30) mappings/codesystems/HL7 Concept Map_ ProcessingID - Sheet1.csv does not have any FHIR Mapping Content
+W32) mappings/codesystems/HL7 Concept Map_ ProcessingID - Sheet1.csv does not have any FHIR Mapping Content
at mappings/codesystems/HL7 Concept Map_ ProcessingID - Sheet1.csv(:1)
near: HL7 v2,,,Condition (IF TRUE),,,HL7 FHIR,,
-W31) Link to unknown for hl concept map_ processingmode sheetcsv: ConceptMap-table-hl0207-to-unknown.html
+W33) Link to unknown for hl concept map_ processingmode sheetcsv: ConceptMap-table-hl0207-to-unknown.html
at mappings/codesystems/HL7 Concept Map_ ProcessingMode - Sheet1.csv(:0)
-W32) mappings/codesystems/HL7 Concept Map_ ProcessingMode - Sheet1.csv does not have any FHIR Mapping Content
+W34) mappings/codesystems/HL7 Concept Map_ ProcessingMode - Sheet1.csv does not have any FHIR Mapping Content
at mappings/codesystems/HL7 Concept Map_ ProcessingMode - Sheet1.csv(:1)
near: HL7 v2,,,Condition (IF TRUE),,,HL7 FHIR,,
-W33) Link to unknown for hl concept map_ requesteddispenseunits sheetcsv: ConceptMap-table-requesteddispenseunits-to-unknown.html
+W35) Link to unknown for hl concept map_ requesteddispenseunits sheetcsv: ConceptMap-table-requesteddispenseunits-to-unknown.html
at mappings/codesystems/HL7 Concept Map_ RequestedDispenseUnits - Sheet1.csv(:0)
-W34) mappings/codesystems/HL7 Concept Map_ RequestedDispenseUnits - Sheet1.csv does not have any FHIR Mapping Content
+W36) mappings/codesystems/HL7 Concept Map_ RequestedDispenseUnits - Sheet1.csv does not have any FHIR Mapping Content
at mappings/codesystems/HL7 Concept Map_ RequestedDispenseUnits - Sheet1.csv(:1)
near: HL7 v2,,,Condition (IF True),,,HL7 FHIR,,,,,Comments
-W35) Link to unknown for hl concept map_ requesteddosageform sheetcsv: ConceptMap-table-requesteddosageform-to-unknown.html
+W37) Link to unknown for hl concept map_ requesteddosageform sheetcsv: ConceptMap-table-requesteddosageform-to-unknown.html
at mappings/codesystems/HL7 Concept Map_ RequestedDosageForm - Sheet1.csv(:0)
-W36) mappings/codesystems/HL7 Concept Map_ RequestedDosageForm - Sheet1.csv does not have any FHIR Mapping Content
+W38) mappings/codesystems/HL7 Concept Map_ RequestedDosageForm - Sheet1.csv does not have any FHIR Mapping Content
at mappings/codesystems/HL7 Concept Map_ RequestedDosageForm - Sheet1.csv(:1)
near: HL7 v2,,,Condition (IF True),,,HL7 FHIR,,,,,Comments
-W37) Link to unknown for hl concept map_ requesteddrugstrengthvolumeunits sheetcsv: ConceptMap-table-requesteddrugstrengthvolumeunits-to-unknown.html
+W39) Link to unknown for hl concept map_ requesteddrugstrengthvolumeunits sheetcsv: ConceptMap-table-requesteddrugstrengthvolumeunits-to-unknown.html
at mappings/codesystems/HL7 Concept Map_ RequestedDrugStrengthVolumeUnits - Sheet1.csv(:0)
-W38) mappings/codesystems/HL7 Concept Map_ RequestedDrugStrengthVolumeUnits - Sheet1.csv does not have any FHIR Mapping Content
+W40) mappings/codesystems/HL7 Concept Map_ RequestedDrugStrengthVolumeUnits - Sheet1.csv does not have any FHIR Mapping Content
at mappings/codesystems/HL7 Concept Map_ RequestedDrugStrengthVolumeUnits - Sheet1.csv(:1)
near: HL7 v2,,,Condition (IF True),,,HL7 FHIR,,,,,Comments
-W39) Link to unknown for hl concept map_ requestedgivestrengthunits sheetcsv: ConceptMap-table-requestedgivestrengthunits-to-unknown.html
+W41) Link to unknown for hl concept map_ requestedgivestrengthunits sheetcsv: ConceptMap-table-requestedgivestrengthunits-to-unknown.html
at mappings/codesystems/HL7 Concept Map_ RequestedGiveStrengthUnits - Sheet1.csv(:0)
-W40) mappings/codesystems/HL7 Concept Map_ RequestedGiveStrengthUnits - Sheet1.csv does not have any FHIR Mapping Content
+W42) mappings/codesystems/HL7 Concept Map_ RequestedGiveStrengthUnits - Sheet1.csv does not have any FHIR Mapping Content
at mappings/codesystems/HL7 Concept Map_ RequestedGiveStrengthUnits - Sheet1.csv(:1)
near: HL7 v2,,,Condition (IF True),,,HL7 FHIR,,,,,Comments
-W41) Link to unknown for hl concept map_ requestedgiveunits sheetcsv: ConceptMap-table-requestedgiveunits-to-unknown.html
+W43) Link to unknown for hl concept map_ requestedgiveunits sheetcsv: ConceptMap-table-requestedgiveunits-to-unknown.html
at mappings/codesystems/HL7 Concept Map_ RequestedGiveUnits - Sheet1.csv(:0)
-W42) mappings/codesystems/HL7 Concept Map_ RequestedGiveUnits - Sheet1.csv does not have any FHIR Mapping Content
+W44) mappings/codesystems/HL7 Concept Map_ RequestedGiveUnits - Sheet1.csv does not have any FHIR Mapping Content
at mappings/codesystems/HL7 Concept Map_ RequestedGiveUnits - Sheet1.csv(:1)
near: HL7 v2,,,Condition (IF True),,,HL7 FHIR,,,,,Comments
-W43) Link to unknown for hl concept map_ routinginstruction sheetcsv: ConceptMap-table-routinginstruction-to-unknown.html
+W45) Link to unknown for hl concept map_ routinginstruction sheetcsv: ConceptMap-table-routinginstruction-to-unknown.html
at mappings/codesystems/HL7 Concept Map_ RoutingInstruction - Sheet1.csv(:0)
-W44) mappings/codesystems/HL7 Concept Map_ RoutingInstruction - Sheet1.csv does not have any FHIR Mapping Content
+W46) mappings/codesystems/HL7 Concept Map_ RoutingInstruction - Sheet1.csv does not have any FHIR Mapping Content
at mappings/codesystems/HL7 Concept Map_ RoutingInstruction - Sheet1.csv(:1)
near: HL7 v2,,,Condition (IF True),,,HL7 FHIR,,,,,Comments
-W45) Link to unknown for hl concept map_ securitylabelhandlinginstructions sheetcsv: ConceptMap-table-securitylabelhandlinginstructions-to-unknown.html
+W47) Link to unknown for hl concept map_ securitylabelhandlinginstructions sheetcsv: ConceptMap-table-securitylabelhandlinginstructions-to-unknown.html
at mappings/codesystems/HL7 Concept Map_ SecurityLabelHandlingInstructions - Sheet1.csv(:0)
-W46) mappings/codesystems/HL7 Concept Map_ SecurityLabelHandlingInstructions - Sheet1.csv does not have any FHIR Mapping Content
+W48) mappings/codesystems/HL7 Concept Map_ SecurityLabelHandlingInstructions - Sheet1.csv does not have any FHIR Mapping Content
at mappings/codesystems/HL7 Concept Map_ SecurityLabelHandlingInstructions - Sheet1.csv(:1)
near: HL7 v2,,,Condition (IF True),,,HL7 FHIR,,,,,Comments
-W47) Link to unknown for hl concept map_ specimensourcesite sheetcsv: ConceptMap-table-specimensourcesite-to-unknown.html
+W49) Link to unknown for hl concept map_ specimensourcesite sheetcsv: ConceptMap-table-specimensourcesite-to-unknown.html
at mappings/codesystems/HL7 Concept Map_ SpecimenSourceSite - Sheet1.csv(:0)
-W48) mappings/codesystems/HL7 Concept Map_ SpecimenSourceSite - Sheet1.csv does not have any FHIR Mapping Content
+W50) mappings/codesystems/HL7 Concept Map_ SpecimenSourceSite - Sheet1.csv does not have any FHIR Mapping Content
at mappings/codesystems/HL7 Concept Map_ SpecimenSourceSite - Sheet1.csv(:1)
near: HL7 v2,,,Condition (IF True),,,HL7 FHIR,,,,,Comments
-W49) Link to unknown for hl concept map_ specimensourcetypemodifier sheetcsv: ConceptMap-table-specimensourcetypemodifier-to-unknown.html
+W51) Link to unknown for hl concept map_ specimensourcetypemodifier sheetcsv: ConceptMap-table-specimensourcetypemodifier-to-unknown.html
at mappings/codesystems/HL7 Concept Map_ SpecimenSourceTypeModifier - Sheet1.csv(:0)
-W50) mappings/codesystems/HL7 Concept Map_ SpecimenSourceTypeModifier - Sheet1.csv does not have any FHIR Mapping Content
+W52) mappings/codesystems/HL7 Concept Map_ SpecimenSourceTypeModifier - Sheet1.csv does not have any FHIR Mapping Content
at mappings/codesystems/HL7 Concept Map_ SpecimenSourceTypeModifier - Sheet1.csv(:1)
near: HL7 v2,,,Condition (IF True),,,HL7 FHIR,,,,,Comments
-W51) Link to unknown for hl concept map_ testservicedefaultdurationunits sheetcsv: ConceptMap-table-testservicedefaultdurationunits-to-unknown.html
+W53) Link to unknown for hl concept map_ testservicedefaultdurationunits sheetcsv: ConceptMap-table-testservicedefaultdurationunits-to-unknown.html
at mappings/codesystems/HL7 Concept Map_ TestServiceDefaultDurationUnits - Sheet1.csv(:0)
-W52) mappings/codesystems/HL7 Concept Map_ TestServiceDefaultDurationUnits - Sheet1.csv does not have any FHIR Mapping Content
+W54) mappings/codesystems/HL7 Concept Map_ TestServiceDefaultDurationUnits - Sheet1.csv does not have any FHIR Mapping Content
at mappings/codesystems/HL7 Concept Map_ TestServiceDefaultDurationUnits - Sheet1.csv(:1)
near: HL7 v2,,,Condition (IF True),,,HL7 FHIR,,,,,Comments
-W53) Link to unknown for hl concept map_ vipindicator sheetcsv: ConceptMap-table-vipindicator-to-unknown.html
+W55) Link to unknown for hl concept map_ vipindicator sheetcsv: ConceptMap-table-vipindicator-to-unknown.html
at mappings/codesystems/HL7 Concept Map_ VIPIndicator - Sheet1.csv(:0)
-W54) mappings/codesystems/HL7 Concept Map_ VIPIndicator - Sheet1.csv does not have any FHIR Mapping Content
+W56) mappings/codesystems/HL7 Concept Map_ VIPIndicator - Sheet1.csv does not have any FHIR Mapping Content
at mappings/codesystems/HL7 Concept Map_ VIPIndicator - Sheet1.csv(:1)
near: HL7 v2,,,Condition (IF True),,,HL7 FHIR,,,,,Comments
-W55) Link to unknown for hl concept map_ yesnoindicator sheetcsv: ConceptMap-table-hl70136-to-unknown.html
+W57) Link to unknown for hl concept map_ yesnoindicator sheetcsv: ConceptMap-table-hl70136-to-unknown.html
at mappings/codesystems/HL7 Concept Map_ YesNoIndicator - Sheet1.csv(:0)
-W56) mappings/codesystems/HL7 Concept Map_ YesNoIndicator - Sheet1.csv does not have any FHIR Mapping Content
+W58) mappings/codesystems/HL7 Concept Map_ YesNoIndicator - Sheet1.csv does not have any FHIR Mapping Content
at mappings/codesystems/HL7 Concept Map_ YesNoIndicator - Sheet1.csv(:1)
near: HL7 v2,,,Condition (IF True),,,HL7 FHIR,,,,,Comments
-W57) Missing source for mapping at mappings/datatypes/HL7 Data Type - FHIR R4_ CX[RelatedPerson-Mother] - Sheet1.csv(:3)
+W59) Missing source for mapping at mappings/datatypes/HL7 Data Type - FHIR R4_ CX[RelatedPerson-Mother] - Sheet1.csv(:3)
near: 0,,,,,,,,,patient(Patient.identifier),,,,,,,/one of the PID-3 or other available identifiers that uniquely links to the patient who's mother is represented in this RelatedPerson instance./,,
-W58) Missing source for mapping at mappings/datatypes/HL7 Data Type - FHIR R4_ CX[RelatedPerson-Mother] - Sheet1.csv(:4)
+W60) Missing source for mapping at mappings/datatypes/HL7 Data Type - FHIR R4_ CX[RelatedPerson-Mother] - Sheet1.csv(:4)
near: 0,,,,,,,,,relationship[1].coding[1].code,,,,,,,"/a relationship type that represents ""mother"" should be populated with ""MTH"" as default if no further context is known, or either of ""AOPTM"", ""GESTM"", ""NMTH"", ""NMTHF"", ""STPMTH"" if the context is known.",,
-W59) Missing source for mapping at mappings/datatypes/HL7 Data Type - FHIR R4_ CX[RelatedPerson-Mother] - Sheet1.csv(:5)
+W61) Missing source for mapping at mappings/datatypes/HL7 Data Type - FHIR R4_ CX[RelatedPerson-Mother] - Sheet1.csv(:5)
near: 0,,,,,,,,,relationship[1].coding[1].system,,,,,,,"""https://hl7.org/fhir/R4/v3/RoleCode/cs.html#v3-RoleCode-_PersonalRelationshipRoleType""",,
-W60) Missing source for mapping at mappings/datatypes/HL7 Data Type - FHIR R4_ ED[DocumentReference] - Sheet1.csv(:3)
+W62) Missing source for mapping at mappings/datatypes/HL7 Data Type - FHIR R4_ ED[DocumentReference] - Sheet1.csv(:3)
near: 0,,,,,,,,,status,,,,,,,"""current""",,
-W61) Missing source for mapping at mappings/datatypes/HL7 Data Type - FHIR R4_ SN[Quantity] - Sheet1.csv(:3)
+W63) Missing source for mapping at mappings/datatypes/HL7 Data Type - FHIR R4_ SN[Quantity] - Sheet1.csv(:3)
near: 0,,,,,,If SN.3 OR SN.4 VALUED,,,extension[1].url,,uri,,,,,"""http://hl7.org/fhir/StructureDefinition/originalText""",,
-W62) Missing source for mapping at mappings/datatypes/HL7 Data Type - FHIR R4_ SN[Quantity] - Sheet1.csv(:4)
+W64) Missing source for mapping at mappings/datatypes/HL7 Data Type - FHIR R4_ SN[Quantity] - Sheet1.csv(:4)
near: 0,,,,,,If SN.3 OR SN.4 VALUED,,,extension[1].valueString,,string,,,,,"SN.1+"" ""+SN.2+"" ""+SN.3+"" ""+SN.4",,
-W63) Missing source for mapping at mappings/datatypes/HL7 Data Type - FHIR R4_ SN[Range] - Sheet1.csv(:3)
+W65) Missing source for mapping at mappings/datatypes/HL7 Data Type - FHIR R4_ SN[Range] - Sheet1.csv(:3)
near: 0,,,,,,If SN.1 OR SN.3 VALUED,,,extension[1].url,,uri,,,,,"""http://hl7.org/fhir/StructureDefinition/originalText""",,
-W64) Missing source for mapping at mappings/datatypes/HL7 Data Type - FHIR R4_ SN[Range] - Sheet1.csv(:4)
+W66) Missing source for mapping at mappings/datatypes/HL7 Data Type - FHIR R4_ SN[Range] - Sheet1.csv(:4)
near: 0,,,,,,If SN.1 OR SN.3 VALUED,,,extension[1].valueString,,string,,,,,"SN.1+"" ""+SN.2+"" ""+SN.3+"" ""+SN.4",,
-W65) Missing source for mapping at mappings/datatypes/HL7 Data Type - FHIR R4_ SN[Ratio] - Sheet1.csv(:3)
+W67) Missing source for mapping at mappings/datatypes/HL7 Data Type - FHIR R4_ SN[Ratio] - Sheet1.csv(:3)
near: 0,,,,,,If SN.3 OR SN.4 VALUED,,,extension[1].url,,uri,,,,,"""http://hl7.org/fhir/StructureDefinition/originalText""",,
-W66) Missing source for mapping at mappings/datatypes/HL7 Data Type - FHIR R4_ SN[Ratio] - Sheet1.csv(:4)
+W68) Missing source for mapping at mappings/datatypes/HL7 Data Type - FHIR R4_ SN[Ratio] - Sheet1.csv(:4)
near: 0,,,,,,If SN.3 OR SN.4 VALUED,,,extension[1].valueString,,string,,,,,"SN.1+"" ""+SN.2+"" ""+SN.3+"" ""+SN.4",,
-W67) Missing vocabulary mapping for SpecimenCondition at mappings/datatypes/HL7 Data Type - FHIR R4_ SPS[Specimen-Source] - Sheet1.csv(:8)
+W69) Missing vocabulary mapping for SpecimenCondition at mappings/datatypes/HL7 Data Type - FHIR R4_ SPS[Specimen-Source] - Sheet1.csv(:8)
near: 6,SPS.6,Collection method modifier code,CE,0,1,,,,condition,,CodeableConcept,0,1,CWE[CodeableConcept],SpecimenCondition,,,Note that in v2.5.1 only F (Frozen) and R(Refrigirated) are indicated without a full table. SpecimenCondition would be used in more curent case and is referenced if somebody used that table already.
-W68) Missing vocabulary mapping for AddressType[Type] at mappings/datatypes/HL7 Data Type - FHIR R4_ XAD[Address] - Sheet1.csv(:9)
+W70) Missing vocabulary mapping for AddressType[Type] at mappings/datatypes/HL7 Data Type - FHIR R4_ XAD[Address] - Sheet1.csv(:9)
near: 7,XAD.7,Address Type,ID,0,1,"IF XAD.7 IN (""M"", ""SH"")",,,type,,code,0,1,,AddressType[Type],,,
-W69) Missing vocabulary mapping for AddressType[Use] at mappings/datatypes/HL7 Data Type - FHIR R4_ XAD[Address] - Sheet1.csv(:10)
+W71) Missing vocabulary mapping for AddressType[Use] at mappings/datatypes/HL7 Data Type - FHIR R4_ XAD[Address] - Sheet1.csv(:10)
near: 7,XAD.7,Address Type,ID,0,1,"IF XAD.7 IN (""BA"", ""BI"", ""C"", ""B"", ""H"", ""O"")",,,use,,code,0,1,,AddressType[Use],,,
-W70) mappings/codesystems/HL7 Concept Map_ SegmentActionCode - Sheet1.csv does not have any FHIR Mapping Content
+W72) mappings/codesystems/HL7 Concept Map_ SegmentActionCode - Sheet1.csv does not have any FHIR Mapping Content
at mappings/codesystems/HL7 Concept Map_ SegmentActionCode - Sheet1.csv(:1)
near: HL7 v2,,,Condition (IF True),,,HL7 FHIR,,,,,Comments
-W71) Missing vocabulary mapping for FillerStatusCodes[Appointment] at mappings/segments/HL7 Segment - FHIR R4_ AIS[Appointment] - Sheet1.csv(:12)
+W73) Missing vocabulary mapping for FillerStatusCodes[Appointment] at mappings/segments/HL7 Segment - FHIR R4_ AIS[Appointment] - Sheet1.csv(:12)
near: 10,AIS-10,Filler Status Code,CWE,0,1,,,,status,,CodeableConcept,0,1,CWE[CodeableConcept],FillerStatusCodes[Appointment],,,
-W72) Missing vocabulary mapping for AllergenType[AllergyIntoleranceCategory] at mappings/segments/HL7 Segment - FHIR R4_ AL1[AllergyIntolerance] - AL1.csv(:6)
+W74) Missing vocabulary mapping for AllergenType[AllergyIntoleranceCategory] at mappings/segments/HL7 Segment - FHIR R4_ AL1[AllergyIntolerance] - AL1.csv(:6)
near: "
-W73) Missing vocabulary mapping for AllergenType[AllergyIntoleranceOriginalCategory] at mappings/segments/HL7 Segment - FHIR R4_ AL1[AllergyIntolerance] - AL1.csv(:8)
+W75) Missing vocabulary mapping for AllergenType[AllergyIntoleranceOriginalCategory] at mappings/segments/HL7 Segment - FHIR R4_ AL1[AllergyIntolerance] - AL1.csv(:8)
near: 2,AL1-2,Allergen Type Code,CWE,0,1,,,,category.extension[1].url,,uri,1,1,,,"""http://hl7.org/fhir/StructureDefinition/alternate-codes""",,
-W74) Missing vocabulary mapping for AllergenType at mappings/segments/HL7 Segment - FHIR R4_ AL1[AllergyIntolerance] - AL1.csv(:9)
+W76) Missing vocabulary mapping for AllergenType at mappings/segments/HL7 Segment - FHIR R4_ AL1[AllergyIntolerance] - AL1.csv(:9)
near: 2,AL1-2,Allergen Type Code,CWE,0,1,,,,category.extension[1].valueCodeableConcept,,CodeableConcept,1,1,CWE[CodeableConcept],AllergenType[AllergyIntoleranceOriginalCategory],,,
-W75) Missing vocabulary mapping for AllergySeverity[AllergyIntolerance.criticality] at mappings/segments/HL7 Segment - FHIR R4_ AL1[AllergyIntolerance] - AL1.csv(:11)
+W77) Missing vocabulary mapping for AllergySeverity[AllergyIntolerance.criticality] at mappings/segments/HL7 Segment - FHIR R4_ AL1[AllergyIntolerance] - AL1.csv(:11)
near: 3,AL1-3,Allergen Code/Mnemonic/Description,CWE,1,1,,,,code,,CodeableConcept,0,1,CWE[CodeableConcept],,,,
-W76) Missing vocabulary mapping for AllergySeverity[AllergyIntolerance.criticality-original] at mappings/segments/HL7 Segment - FHIR R4_ AL1[AllergyIntolerance] - AL1.csv(:13)
+W78) Missing vocabulary mapping for AllergySeverity[AllergyIntolerance.criticality-original] at mappings/segments/HL7 Segment - FHIR R4_ AL1[AllergyIntolerance] - AL1.csv(:13)
near: 4,AL1-4,Allergy Severity Code,CWE,0,1,,,If severity was used equivalent to criticality,criticality.extension[1].url,,uri,1,1,,,"""http://hl7.org/fhir/StructureDefinition/alternate-codes""",,
-W77) Missing vocabulary mapping for AllergySeverity at mappings/segments/HL7 Segment - FHIR R4_ AL1[AllergyIntolerance] - AL1.csv(:14)
+W79) Missing vocabulary mapping for AllergySeverity at mappings/segments/HL7 Segment - FHIR R4_ AL1[AllergyIntolerance] - AL1.csv(:14)
near: 4,AL1-4,Allergy Severity Code,CWE,0,1,,,If severity was used equivalent to criticality,criticality.extension[1].valueCodeableConcept,,CodeableConcept,1,1,CWE[CodeableConcept],AllergySeverity[AllergyIntolerance.criticality-original],,,
-W78) Missing source for mapping at mappings/segments/HL7 Segment - FHIR R4_ IAM[AllergyIntolerance] - Sheet1.csv(:3)
+W80) Missing source for mapping at mappings/segments/HL7 Segment - FHIR R4_ IAM[AllergyIntolerance] - Sheet1.csv(:3)
near: 0,,,,,,,,,clinicalStatus.coding.code,,code,0,1,,,"""active""",,"While .clinicalStatus is not required, constraint ait-1 (AllergyIntolerance.clinicalStatus SHALL be present if verificationStatus is not entered-in-error.) does necessitate populating this element in the map as it's not possible to infer a verificationStatus of ""entered-in-error"" based on the data in IAM."
-W79) Missing source for mapping at mappings/segments/HL7 Segment - FHIR R4_ IAM[AllergyIntolerance] - Sheet1.csv(:4)
+W81) Missing source for mapping at mappings/segments/HL7 Segment - FHIR R4_ IAM[AllergyIntolerance] - Sheet1.csv(:4)
near: 0,,,,,,,,,clinicalStatus.coding.system,,uri,0,1,,,"""http://terminology.hl7.org/CodeSystem/allergyintolerance-clinical""",,
-W80) Missing vocabulary mapping for AllergenType[AllergyIntoleranceCategory] at mappings/segments/HL7 Segment - FHIR R4_ IAM[AllergyIntolerance] - Sheet1.csv(:6)
+W82) Missing vocabulary mapping for AllergenType[AllergyIntoleranceCategory] at mappings/segments/HL7 Segment - FHIR R4_ IAM[AllergyIntolerance] - Sheet1.csv(:6)
near: 2,IAM-2,Allergen Type Code,CWE,0,1,,,,category,,code,0,-1,CWE[code],AllergenType[AllergyIntoleranceCategory],,,"The FHIR table has a ""required"" binding. Do we need to expand the values in the FHIR table?
Could other be used for:
@@ -194,34 +199,32 @@ Miscellaneous contraindication
Animal Allergy
HL70127 is a user defined table"
-W81) Missing vocabulary mapping for AllergenType[AllergyIntoleranceOriginalCategory] at mappings/segments/HL7 Segment - FHIR R4_ IAM[AllergyIntolerance] - Sheet1.csv(:8)
+W83) Missing vocabulary mapping for AllergenType[AllergyIntoleranceOriginalCategory] at mappings/segments/HL7 Segment - FHIR R4_ IAM[AllergyIntolerance] - Sheet1.csv(:8)
near: 2,IAM-2,Allergen Type Code,CWE,0,1,,,,category.extension[1].valueCodeableConcept,,CodeableConcept,1,1,CWE[CodeableConcept],AllergenType[AllergyIntoleranceOriginalCategory],,,
-W82) Missing vocabulary mapping for AllergenType at mappings/segments/HL7 Segment - FHIR R4_ IAM[AllergyIntolerance] - Sheet1.csv(:9)
+W84) Missing vocabulary mapping for AllergenType at mappings/segments/HL7 Segment - FHIR R4_ IAM[AllergyIntolerance] - Sheet1.csv(:9)
near: 2,IAM-2,Allergen Type Code,CWE,0,1,,,,type,,code,0,1,CWE[code],AllergenType,,,
-W83) Missing vocabulary mapping for AllergySeverity[AllergyIntolerance.reaction.severity] at mappings/segments/HL7 Segment - FHIR R4_ IAM[AllergyIntolerance] - Sheet1.csv(:11)
+W85) Missing vocabulary mapping for AllergySeverity[AllergyIntolerance.reaction.severity] at mappings/segments/HL7 Segment - FHIR R4_ IAM[AllergyIntolerance] - Sheet1.csv(:11)
near: 4,IAM-4,Allergy Severity Code,CWE,0,1,,,If severity was not used equivalent to criticality,reaction.severity,,code,0,1,CWE[Code],AllergySeverity[AllergyIntolerance.reaction.severity],,,
-W84) Missing vocabulary mapping for AllergySeverity[AllergyIntolerance.criticality] at mappings/segments/HL7 Segment - FHIR R4_ IAM[AllergyIntolerance] - Sheet1.csv(:12)
+W86) Missing vocabulary mapping for AllergySeverity[AllergyIntolerance.criticality] at mappings/segments/HL7 Segment - FHIR R4_ IAM[AllergyIntolerance] - Sheet1.csv(:12)
near: 4,IAM-4,Allergy Severity Code,CWE,0,1,,,If severity was used equivalent to criticality,criticality,,code,0,1,CWE[code],AllergySeverity[AllergyIntolerance.criticality],,,"Note that AllergyIntolerance.reaction.severity is available in FHIR but from a base standard perspective that is actually not the most appropriate and would require that AL1-6 is valued as well. However, a local implementation may have used vocabulary that better fits AllergyIntolerance.reaction.severity and should then consider that instead as a local variation. Note that the .reaction though is at a particular time, while .criticality is an overall assement that matches HL7 v2 generally better."
-W85) Missing vocabulary mapping for AllergySeverity[AllergyIntolerance.criticality-original] at mappings/segments/HL7 Segment - FHIR R4_ IAM[AllergyIntolerance] - Sheet1.csv(:14)
+W87) Missing vocabulary mapping for AllergySeverity[AllergyIntolerance.criticality-original] at mappings/segments/HL7 Segment - FHIR R4_ IAM[AllergyIntolerance] - Sheet1.csv(:14)
near: 4,IAM-4,Allergy Severity Code,CWE,0,1,,,If severity was used equivalent to criticality,criticality.extension[1].valueCodeableConcept,,CodeableConcept,1,1,CWE[CodeableConcept],AllergySeverity[AllergyIntolerance.criticality-original],,,
-W86) Missing vocabulary mapping for Event[EncounterStatus] at mappings/segments/HL7 Segment - FHIR R4_ MSH[Encounter] - Sheet1.csv(:11)
+W88) Missing vocabulary mapping for Event[EncounterStatus] at mappings/segments/HL7 Segment - FHIR R4_ MSH[Encounter] - Sheet1.csv(:11)
near: 9,MSH-9,Message Type,MSG,1,1,,,,status,,code,1,1,MSG[Code],Event[EncounterStatus],,,
-W87) Missing vocabulary mapping for ResultStatus[Non-Queries] at mappings/segments/HL7 Segment - FHIR R4_ OBR[DiagnosticReport] - OBR.csv(:32)
+W89) Missing vocabulary mapping for ResultStatus[Non-Queries] at mappings/segments/HL7 Segment - FHIR R4_ OBR[DiagnosticReport] - OBR.csv(:32)
near: 25,OBR-25,Result Status +,ID,0,1,IF OBR-25 VALUED,,,status,,code,1,1,,ResultStatus[Non-Queries],,,
-W88) Missing vocabulary mapping for ValueType at mappings/segments/HL7 Segment - FHIR R4_ OBX[Observation-Component] - OBX.csv(:4)
- near: 2,OBX-2,Value Type,ID,0,1,,,,,,,,,,ValueType,,,OBX-2 determines the flavor of Observation.value[x] is used in OBX-5
-W89) Missing vocabulary mapping for OrderControlCode[ServiceRequest.status] at mappings/segments/HL7 Segment - FHIR R4_ ORC[ServiceRequest] - ORC.csv(:3)
+W90) Missing vocabulary mapping for OrderControlCode[ServiceRequest.status] at mappings/segments/HL7 Segment - FHIR R4_ ORC[ServiceRequest] - ORC.csv(:3)
near: 1,ORC-1,Order Control,ID,1,1,IF ORC-5 NOT VALUED,"ORC.element(""5"").empty()",,status,,code,1,1,,OrderControlCode[ServiceRequest.status],,,"This is a complicated mapping where .status, .intent, and Task get involved that may have various localized interpretation."
-W90) Missing source for mapping at mappings/segments/HL7 Segment - FHIR R4_ PD1[Observation-LivingWill] - PD1.csv(:3)
+W91) Missing source for mapping at mappings/segments/HL7 Segment - FHIR R4_ PD1[Observation-LivingWill] - PD1.csv(:3)
near: 0,,,,,,,,,status,,code,1,1,,,"""final""",,
-W91) Missing source for mapping at mappings/segments/HL7 Segment - FHIR R4_ PD1[Observation-LivingWill] - PD1.csv(:4)
+W92) Missing source for mapping at mappings/segments/HL7 Segment - FHIR R4_ PD1[Observation-LivingWill] - PD1.csv(:4)
near: 0,,,,,,,,,code.coding.system,,uri,0,1,,,"""http://loinc.org""",,
-W92) Missing source for mapping at mappings/segments/HL7 Segment - FHIR R4_ PD1[Observation-LivingWill] - PD1.csv(:5)
+W93) Missing source for mapping at mappings/segments/HL7 Segment - FHIR R4_ PD1[Observation-LivingWill] - PD1.csv(:5)
near: 0,,,,,,,,,code.coding.code,,code,0,1,,,"""75320-2""",,
-W93) Missing vocabulary mapping for ParticipantOrganizationUnitType at mappings/segments/HL7 Segment - FHIR R4_ PRT[PractitionerRole] - Sheet1.csv(:10)
- near: 7,PRT-7,Organization Unit Type,CWE,0,1,,,,organization[Organization.type],,CodeableConcept,0,1,CWE[CodeableConcept],ParticipantOrganizationUnitType,,,
-W94) Missing vocabulary mapping for ParticipantOrganizationUnitType at mappings/segments/HL7 Segment - FHIR R4_ PRT[RelatedPerson] - Sheet1.csv(:10)
- near: 7,PRT-7,Organization Unit Type,CWE,0,1,,,,,extension??-organizationType,CodeableConcept,0,1,CWE[CodeableConcept],ParticipantOrganizationUnitType,,,
-W95) Missing source for mapping at mappings/segments/HL7 Segment - FHIR R4_ PV1[Basic-EncounterHistory] - PV1.csv(:3)
+W94) Missing source for mapping at mappings/segments/HL7 Segment - FHIR R4_ PV1[Basic-EncounterHistory] - PV1.csv(:3)
near: 0,,,,,,,,,code.coding.code,,code,0,1,,,"""EncounterHistory""",,
-W96) Missing source for mapping at mappings/segments/HL7 Segment - FHIR R4_ PV1[Basic-EncounterHistory] - P
\ No newline at end of file
+W95) Missing source for mapping at mappings/segments/HL7 Segment - FHIR R4_ PV1[Basic-EncounterHistory] - PV1.csv(:4)
+ near: 0,,,,,,,,,code.coding.system,,uri,0,1,,,"""http:/hl7.org/fhir/fhir-types""",,
+W96) Missing vocabulary mapping for PatientClass[EncounterClass] at mappings/segments/HL7 Segment - FHIR R4_ PV1[Encounter] - PV1.csv(:4)
+ near: 2,PV1-2,Patient Class,CWE,1,1,,,,class,,Coding,1,1,CWE[Coding],PatientClass[EncounterClass],,,
+W97) Missing vocabulary mapping for PatientClass[E
\ No newline at end of file
diff --git a/FHIR-v2mappings.xml b/FHIR-v2mappings.xml
index cfc917d4..fc58feb1 100644
--- a/FHIR-v2mappings.xml
+++ b/FHIR-v2mappings.xml
@@ -61,6 +61,7 @@
+
@@ -161,7 +162,7 @@
-
+
diff --git a/input/fsh/Datatype HD to Device.fsh b/input/fsh/Datatype HD to Device.fsh
new file mode 100644
index 00000000..f0fe9e70
--- /dev/null
+++ b/input/fsh/Datatype HD to Device.fsh
@@ -0,0 +1,88 @@
+// HL7 Data Type - FHIR R4_ HD[Device] - Sheet1.csv
+Instance: DatatypeHDToDevice
+InstanceOf: ConceptMap
+Title: "Datatype HD to Device Map"
+* title = "Datatype HD to Device Map"
+* description = "This ConceptMap represents a mapping from the HL7 V2 Datatype HD to the FHIR Device Resource."
+* id = "datatype-hd-to-device"
+* url = "http://hl7.org/fhir/uv/v2mappings/datatype-hd-to-device"
+* version = "1.0"
+* name = "DatatypeHDToDevice"
+* status = #active
+* experimental = true
+* date = "2024-12-09"
+* publisher = "HL7 International, Inc"
+* contact.telecom.system = #email
+* contact.telecom.value = "v2-to-fhir@lists.hl7.org"
+* copyright = "Copyright (c) 2020, HL7 International, Inc., All Rights Reserved."
+* sourceUri = "HD"
+* targetUri = "Device"
+* extension[0].url = "http://hl7.org/fhir/uv/v2mappings/StructureDefinition/RelatedArtifact"
+* extension[0].extension[0].url = "type"
+* extension[0].extension[0].valueCode = #derived-from
+* extension[0].extension[1].url = "label"
+* extension[0].extension[1].valueString = "Datatype HD to Device.fsh"
+* extension[0].extension[2].url = "url"
+* extension[0].extension[2].valueUri = "https://docs.google.com/spreadsheets/d/17DkmOwfcOoVQObJa39jY65XiEbXR7ozzvlgw6S_S0a4/edit?gid=0#gid=0"
+* group.element[0].code = #HD.1
+* group.element[0].extension[0].url = "http://hl7.org/fhir/uv/v2mappings/StructureDefinition/TypeInfo"
+* group.element[0].extension[0].extension[0].url = "type"
+* group.element[0].extension[0].extension[0].valueCode = #"IS"
+* group.element[0].extension[0].extension[1].url = "cardinalityMin"
+* group.element[0].extension[0].extension[1].valueInteger = 0
+* group.element[0].extension[0].extension[2].url = "cardinalityMax"
+* group.element[0].extension[0].extension[2].valueInteger = 1
+* group.element[0].display = "Namespace ID"
+* group.element[0].target.equivalence = #equivalent
+* group.element[0].target.code = #identifier[1].value
+* group.element[0].target.extension[0].url = "http://hl7.org/fhir/uv/v2mappings/StructureDefinition/TypeInfo"
+* group.element[0].target.extension[0].extension[0].url = "type"
+* group.element[0].target.extension[0].extension[0].valueCode = #"string"
+* group.element[0].target.display = "identifier[1].value"
+* group.element[0].target.comment = "Need gForge (#20522) to change MessageHeader.destination.endpoint from 1..1 to 0..1. Must be a reachable address."
+* group.element[1].code = #HD.2
+* group.element[1].extension[0].url = "http://hl7.org/fhir/uv/v2mappings/StructureDefinition/TypeInfo"
+* group.element[1].extension[0].extension[0].url = "type"
+* group.element[1].extension[0].extension[0].valueCode = #"ST"
+* group.element[1].extension[0].extension[1].url = "cardinalityMin"
+* group.element[1].extension[0].extension[1].valueInteger = 0
+* group.element[1].extension[0].extension[2].url = "cardinalityMax"
+* group.element[1].extension[0].extension[2].valueInteger = 1
+* group.element[1].display = "Universal ID"
+* group.element[1].target.equivalence = #equivalent
+* group.element[1].target.code = #identifier[2].value
+* group.element[1].target.extension[0].url = "http://hl7.org/fhir/uv/v2mappings/StructureDefinition/TypeInfo"
+* group.element[1].target.extension[0].extension[0].url = "type"
+* group.element[1].target.extension[0].extension[0].valueCode = #"string"
+* group.element[1].target.display = "identifier[2].value"
+* group.element[2].code = #HD.3
+* group.element[2].extension[0].url = "http://hl7.org/fhir/uv/v2mappings/StructureDefinition/TypeInfo"
+* group.element[2].extension[0].extension[0].url = "type"
+* group.element[2].extension[0].extension[0].valueCode = #"ID"
+* group.element[2].extension[0].extension[1].url = "cardinalityMin"
+* group.element[2].extension[0].extension[1].valueInteger = 0
+* group.element[2].extension[0].extension[2].url = "cardinalityMax"
+* group.element[2].extension[0].extension[2].valueInteger = 1
+* group.element[2].display = "Universal ID Type"
+* group.element[2].target.equivalence = #equivalent
+* group.element[2].target.code = #identifier[2].type
+* group.element[2].target.extension[0].url = "http://hl7.org/fhir/uv/v2mappings/StructureDefinition/TypeInfo"
+* group.element[2].target.extension[0].extension[0].url = "type"
+* group.element[2].target.extension[0].extension[0].valueCode = #"CodeableConcept"
+* group.element[2].target.display = "identifier[2].type"
+* group.element[2].target.comment = "Request that DNS, ISO, and UUID (and other Table 0301 values) are added to: http://hl7.org/fhir/valueset-identifier-type.html"
+* group.element[3].code = #HD.3
+* group.element[3].extension[0].url = "http://hl7.org/fhir/uv/v2mappings/StructureDefinition/TypeInfo"
+* group.element[3].extension[0].extension[0].url = "type"
+* group.element[3].extension[0].extension[0].valueCode = #"ID"
+* group.element[3].extension[0].extension[1].url = "cardinalityMin"
+* group.element[3].extension[0].extension[1].valueInteger = 0
+* group.element[3].extension[0].extension[2].url = "cardinalityMax"
+* group.element[3].extension[0].extension[2].valueInteger = 1
+* group.element[3].display = "Universal ID Type"
+* group.element[3].target.equivalence = #equivalent
+* group.element[3].target.code = #identifier[2].system
+* group.element[3].target.extension[0].url = "http://hl7.org/fhir/uv/v2mappings/StructureDefinition/TypeInfo"
+* group.element[3].target.extension[0].extension[0].url = "type"
+* group.element[3].target.extension[0].extension[0].valueCode = #"uri"
+* group.element[3].target.display = "identifier[2].system"
diff --git a/input/fsh/Segment IN3 to CareTeam.fsh b/input/fsh/Segment IN3 to CareTeam.fsh
new file mode 100644
index 00000000..b56956ea
--- /dev/null
+++ b/input/fsh/Segment IN3 to CareTeam.fsh
@@ -0,0 +1,68 @@
+// HL7 Segment - FHIR R4_ IN3[CareTeam] - Sheet1.csv
+Instance: SegmentIN3ToCareTeam
+InstanceOf: ConceptMap
+Title: "Segment IN3 to CareTeam Map"
+* title = "Segment IN3 to CareTeam Map"
+* description = "This ConceptMap represents a mapping from the HL7 V2 Segment IN3 to the FHIR CareTeam Resource."
+* id = "segment-in3-to-careteam"
+* url = "http://hl7.org/fhir/uv/v2mappings/segment-in3-to-careteam"
+* version = "1.0"
+* name = "SegmentIN3ToCareTeam"
+* status = #active
+* experimental = true
+* date = "2024-12-09"
+* publisher = "HL7 International, Inc"
+* contact.telecom.system = #email
+* contact.telecom.value = "v2-to-fhir@lists.hl7.org"
+* copyright = "Copyright (c) 2020, HL7 International, Inc., All Rights Reserved."
+* sourceUri = "IN3"
+* targetUri = "CareTeam"
+* extension[0].url = "http://hl7.org/fhir/uv/v2mappings/StructureDefinition/RelatedArtifact"
+* extension[0].extension[0].url = "type"
+* extension[0].extension[0].valueCode = #derived-from
+* extension[0].extension[1].url = "label"
+* extension[0].extension[1].valueString = "Segment IN3 to CareTeam.fsh"
+* extension[0].extension[2].url = "url"
+* extension[0].extension[2].valueUri = "https://docs.google.com/spreadsheets/d/1kWvcYxTaofNaqq5k5qjsqBEQRsjGGKiwAyCoTc8ADhY/edit#gid=0"
+* group.element[0].code = #IN3-21
+* group.element[0].extension[0].url = "http://hl7.org/fhir/uv/v2mappings/StructureDefinition/TypeInfo"
+* group.element[0].extension[0].extension[0].url = "type"
+* group.element[0].extension[0].extension[0].valueCode = #"ST"
+* group.element[0].extension[0].extension[1].url = "cardinalityMin"
+* group.element[0].extension[0].extension[1].valueInteger = 1
+* group.element[0].extension[0].extension[2].url = "cardinalityMax"
+* group.element[0].extension[0].extension[2].valueInteger = 1
+* group.element[0].display = "Case Manager"
+* group.element[0].target.equivalence = #equivalent
+* group.element[0].target.code = #participant.role.coding.value
+* group.element[0].target.extension[0].url = "http://hl7.org/fhir/uv/v2mappings/StructureDefinition/TypeInfo"
+* group.element[0].target.extension[0].extension[0].url = "type"
+* group.element[0].target.extension[0].extension[0].valueCode = #"string"
+* group.element[0].target.display = "participant.role.coding.value"
+* group.element[1].code = #IN3-21
+* group.element[1].extension[0].url = "http://hl7.org/fhir/uv/v2mappings/StructureDefinition/TypeInfo"
+* group.element[1].extension[0].extension[0].url = "type"
+* group.element[1].extension[0].extension[0].valueCode = #"ST"
+* group.element[1].extension[0].extension[1].url = "cardinalityMin"
+* group.element[1].extension[0].extension[1].valueInteger = 1
+* group.element[1].extension[0].extension[2].url = "cardinalityMax"
+* group.element[1].extension[0].extension[2].valueInteger = 1
+* group.element[1].display = "Case Manager"
+* group.element[1].target.equivalence = #equivalent
+* group.element[1].target.code = #participant.role.coding.system
+* group.element[1].target.extension[0].url = "http://hl7.org/fhir/uv/v2mappings/StructureDefinition/TypeInfo"
+* group.element[1].target.extension[0].extension[0].url = "type"
+* group.element[1].target.extension[0].extension[0].valueCode = #"uri"
+* group.element[1].target.display = "participant.role.coding.system"
+* group.element[2].code = #IN3-21
+* group.element[2].extension[0].url = "http://hl7.org/fhir/uv/v2mappings/StructureDefinition/TypeInfo"
+* group.element[2].extension[0].extension[0].url = "type"
+* group.element[2].extension[0].extension[0].valueCode = #"ST"
+* group.element[2].extension[0].extension[1].url = "cardinalityMin"
+* group.element[2].extension[0].extension[1].valueInteger = 1
+* group.element[2].extension[0].extension[2].url = "cardinalityMax"
+* group.element[2].extension[0].extension[2].valueInteger = 1
+* group.element[2].display = "Case Manager"
+* group.element[2].target.equivalence = #equivalent
+* group.element[2].target.code = #participant.role.text
+* group.element[2].target.display = "participant.role.text"
diff --git a/input/fsh/Unsupported Datatype HD to Device.fsh b/input/fsh/Unsupported Datatype HD to Device.fsh
deleted file mode 100644
index b1e8c76a..00000000
--- a/input/fsh/Unsupported Datatype HD to Device.fsh
+++ /dev/null
@@ -1,17 +0,0 @@
-// mappings/segments/HL7 Segment - FHIR R4_ MSH[MessageHeader] - R4.csv:8
-Instance: UnsupportedDatatypeHDToDevice
-InstanceOf: ConceptMap
-Title: "Datatype HD to Device Map - Unsupported"
-* title = "Datatype HD to Device Map - Unsupported"
-* description = "This ConceptMap represents a mapping from the HL7 V2 Datatype HD to the FHIR Device. It is not yet supported."
-* id = "unsupported-datatype-hd-to-device"
-* url = "http://hl7.org/fhir/uv/v2mappings/unsupported-datatype-hd-to-device"
-* version = "1.0"
-* name = "UnsupportedDatatypeHDToDevice"
-* status = #active
-* experimental = true
-* date = "2024-12-09"
-* publisher = "HL7 International, Inc"
-* contact.telecom.system = #email
-* contact.telecom.value = "v2-to-fhir@lists.hl7.org"
-* copyright = "Copyright (c) 2020, HL7 International, Inc., All Rights Reserved."
diff --git a/input/fsh/Unsupported Segment IN3 to CareTeam.fsh b/input/fsh/Unsupported Segment IN3 to CareTeam.fsh
deleted file mode 100644
index a2872948..00000000
--- a/input/fsh/Unsupported Segment IN3 to CareTeam.fsh
+++ /dev/null
@@ -1,17 +0,0 @@
-// mappings/messages/HL7 Message - FHIR R4_ OML_O21 - Sheet1.csv:33
-Instance: UnsupportedSegmentIN3ToCareTeam
-InstanceOf: ConceptMap
-Title: "Segment IN3 to CareTeam Map - Unsupported"
-* title = "Segment IN3 to CareTeam Map - Unsupported"
-* description = "This ConceptMap represents a mapping from the HL7 V2 Segment IN3 to the FHIR CareTeam. It is not yet supported."
-* id = "unsupported-segment-in3-to-careteam"
-* url = "http://hl7.org/fhir/uv/v2mappings/unsupported-segment-in3-to-careteam"
-* version = "1.0"
-* name = "UnsupportedSegmentIN3ToCareTeam"
-* status = #active
-* experimental = true
-* date = "2024-12-09"
-* publisher = "HL7 International, Inc"
-* contact.telecom.system = #email
-* contact.telecom.value = "v2-to-fhir@lists.hl7.org"
-* copyright = "Copyright (c) 2020, HL7 International, Inc., All Rights Reserved."
diff --git a/input/includes/ConceptMap-datatype-hd-to-device-intro.md b/input/includes/ConceptMap-datatype-hd-to-device-intro.md
new file mode 100644
index 00000000..9d6e540f
--- /dev/null
+++ b/input/includes/ConceptMap-datatype-hd-to-device-intro.md
@@ -0,0 +1,11 @@
+
+This ConceptMap represents the mapping from the HL7 V2 HD Data Type to the FHIR Device Resource. See also the FHIR Shorthand or the CSV Source.
+
diff --git a/input/includes/ConceptMap-datatype-hd-to-device-notes.md b/input/includes/ConceptMap-datatype-hd-to-device-notes.md
new file mode 100644
index 00000000..e69de29b
diff --git a/input/includes/ConceptMap-segment-obx-component-to-observation-intro.md b/input/includes/ConceptMap-segment-obx-component-to-observation-intro.md
index 7c9fd68a..98e150fe 100644
--- a/input/includes/ConceptMap-segment-obx-component-to-observation-intro.md
+++ b/input/includes/ConceptMap-segment-obx-component-to-observation-intro.md
@@ -5,7 +5,7 @@ This ConceptMap represents the mapping from the HL7 V2 OBX Segment to the FHIR O
Sort Order | Identifier | Name | Data Type | Cardinality - Min | Cardinality - Max | Computable ANTLR | Computable FHIRPath | Narrative | FHIR Attribute | Extension | Data Type | Cardinality - Min | Cardinality - Max | Data Type Mapping | Vocabulary Mapping (IS, ID, CE, CEN, CWE) | Assignment |
1 | OBX-1 | Set ID – OBX | SI | 0 | 1 | | | | | | | | | | | | |
-2 | OBX-2 | Value Type | ID | 0 | 1 | | | | | | | | | | ValueType | | OBX-2 determines the flavor of Observation.value[x] is used in OBX-5 |
+2 | OBX-2 | Value Type | ID | 0 | 1 | | | | | | | | | | | | OBX-2 determines the flavor of Observation.value[x] is used in OBX-5 |
3 | OBX-3 | Observation Identifier | CWE | 1 | 1 | | | | Observation.code | | Observation.CodeableConcept | 1 | 1 | CWE[CodeableConcept] | | | |
3 | OBX-3 | Observation Identifier | CWE | 1 | 1 | | | | Observation.component.code | | Observation.CodeableConcept | 1 | 1 | CWE[CodeableConcept] | | | |
4 | OBX-4 | Observation Sub-ID | ST | 0 | 1 | | | Map to Observation.partOf or Observation.hasMember or Observation.DerivedFrom according to the implementation guidance for the v2 message at hand, otherwise map to the extension-sub-id to enable the final destination to determine how to structure the observations. | Observation.$this | | | | | OG[Extension-Subidentifier] | | | OBX-4 Sub Identifier would determine how to use Observation.partOf or Observation.hasMember or Observation.DerivedFrom, but is highly dependent on the local implementation of OBX-4 or an implementation guide (e.g., LRI, Clinical Genomics). That is not known at the standard level, so we cannot provide specific mapping guidance here. However, if the mapper does not have access to the syntax used and its meaning, we need to be able to pass on OBX-4 Sub Identifier to the final destination that should know how to then structure it using FHIR attributes. |
diff --git a/input/includes/ConceptMap-segment-prt-to-practitionerrole-intro.md b/input/includes/ConceptMap-segment-prt-to-practitionerrole-intro.md
index f149b8ae..28b53a58 100644
--- a/input/includes/ConceptMap-segment-prt-to-practitionerrole-intro.md
+++ b/input/includes/ConceptMap-segment-prt-to-practitionerrole-intro.md
@@ -11,7 +11,7 @@ This ConceptMap represents the mapping from the HL7 V2 PRT Segment to the FHIR P
4 | PRT-4 | Role of Participation | CWE | 1 | 1 | | | | PractitionerRole.code | | PractitionerRole.CodeableConcept | 0 | -1 | CWE[CodeableConcept] | Participation | | |
5 | PRT-5 | Person | XCN | 0 | -1 | | | | PractitionerRole.practitioner | | Reference(PractitionerRole.Practitioner) | 0 | 1 | XCN[Practitioner] | | | While PRT may contain multiple persons within one PRT, we believe this to be rare, and when it happens, the implementer needs to determine how to best resolve that. |
6 | PRT-6 | Person Provider Type | CWE | 0 | 1 | | | | PractitionerRole.specialty | | PractitionerRole.CodeableConcept | 0 | -1 | CWE[CodeableConcept] | | | |
-7 | PRT-7 | Organization Unit Type | CWE | 0 | 1 | | | | PractitionerRole.organization | | PractitionerRole.CodeableConcept | 0 | 1 | CWE[CodeableConcept] | ParticipantOrganizationUnitType | | |
+7 | PRT-7 | Organization Unit Type | CWE | 0 | 1 | | | | PractitionerRole.organization | | PractitionerRole.CodeableConcept | 0 | 1 | CWE[CodeableConcept] | ParticipantOrganizationUnitType | | |
8 | PRT-8 | Organization | XON | 0 | -1 | | | | PractitionerRole.organization | | Reference(PractitionerRole.Organization) | 0 | 1 | XON[Organization] | | | While PRT may contain multiple organizations within one PRT, we believe this to be rare, and when it happens, the implementer needs to determine how to best resolve that. |
9 | PRT-9 | Location | PL | 0 | -1 | | | | PractitionerRole.location | | Reference(PractitionerRole.Location) | 0 | 1 | PL[Location] | | | While PRT may contain multiple locations within one PRT, we believe this to be rare, and when it happens, the implementer needs to determine how to best resolve that. |
10 | PRT-10 | Device | EI | 0 | -1 | | | | | | | | | | | | |
diff --git a/input/includes/ConceptMap-segment-prt-to-relatedperson-intro.md b/input/includes/ConceptMap-segment-prt-to-relatedperson-intro.md
index 74cc4674..fc069821 100644
--- a/input/includes/ConceptMap-segment-prt-to-relatedperson-intro.md
+++ b/input/includes/ConceptMap-segment-prt-to-relatedperson-intro.md
@@ -11,7 +11,7 @@ This ConceptMap represents the mapping from the HL7 V2 PRT Segment to the FHIR R
4 | PRT-4 | Role of Participation | CWE | 1 | 1 | | | | RelatedPerson.relationship | | RelatedPerson.CodeableConcept | 0 | -1 | CWE[CodeableConcept] | Participation | | |
5 | PRT-5 | Person | XCN | 0 | -1 | | | | RelatedPerson.$this | | | | | XCN[RelatedPerson] | | | |
6 | PRT-6 | Person Provider Type | CWE | 0 | 1 | | | | | extension??-providerType | RelatedPerson.CodeableConcept | 0 | -1 | CWE[CodeableConcept] | | | |
-7 | PRT-7 | Organization Unit Type | CWE | 0 | 1 | | | | | extension??-organizationType | RelatedPerson.CodeableConcept | 0 | 1 | CWE[CodeableConcept] | ParticipantOrganizationUnitType | | |
+7 | PRT-7 | Organization Unit Type | CWE | 0 | 1 | | | | | extension??-organizationType | RelatedPerson.CodeableConcept | 0 | 1 | CWE[CodeableConcept] | ParticipantOrganizationUnitType | | |
8 | PRT-8 | Organization | XON | 0 | -1 | | | | | extension??-organization(Organization) | Reference(RelatedPerson.Organization) | 0 | 1 | XON[Organization] | | | |
9 | PRT-9 | Location | PL | 0 | -1 | | | | | extension??-location(Location) | Reference(RelatedPerson.Location) | 0 | 1 | PL[Location] | | | |
10 | PRT-10 | Device | EI | 0 | -1 | | | | | | | | | | | | |
diff --git a/input/includes/ConceptMap-segment-rol-to-careteam-intro.md b/input/includes/ConceptMap-segment-rol-to-careteam-intro.md
index 3a372413..4c3577d8 100644
--- a/input/includes/ConceptMap-segment-rol-to-careteam-intro.md
+++ b/input/includes/ConceptMap-segment-rol-to-careteam-intro.md
@@ -16,7 +16,7 @@ This ConceptMap represents the mapping from the HL7 V2 ROL Segment to the FHIR C
8 | ROL-8 | Role Action Reason | CWE | 0 | 1 | | | | CareTeam.reasonCode | | CareTeam.CodeableConcept | 0 | -1 | CWE[CodeableConcept] | | | |
9 | ROL-9 | Provider Type | CWE | 0 | -1 | | | | CareTeam.participant.role | | CareTeam.CodeableConcept | 0 | -1 | CWE[CodeableConcept] | | | |
10 | ROL-10 | Organization Unit Type | CWE | 0 | 1 | IF ROL-4 VALUED | | | CareTeam.participant.onBehalfOf(CareTeam.Organization) | | Reference | 0 | 1 | CWE[CodeableConcept] | | | |
-10 | ROL-10 | Organization Unit Type | CWE | 0 | 1 | IF ROL-4 NOT VALUED | | | CareTeam.participant.member(CareTeam.Organization.type) | | CareTeam.CodeableConcept | 0 | 1 | CWE[CodeableConcept] | ParticipantOrganizationUnitType | | |
+10 | ROL-10 | Organization Unit Type | CWE | 0 | 1 | IF ROL-4 NOT VALUED | | | CareTeam.participant.member(CareTeam.Organization.type) | | CareTeam.CodeableConcept | 0 | 1 | CWE[CodeableConcept] | ParticipantOrganizationUnitType | | |
11 | ROL-11 | Office/Home Address/Birthplace | XAD | 0 | -1 | | | | | | | | | | | | |
12 | ROL-12 | Phone | XTN | 0 | -1 | | | | CareTeam.telecom | | CareTeam.ContactPoint | 0 | -1 | XTN[ContactPoint] | | | |
13 | ROL-13 | Person's Location | PL | 0 | 1 | | | | | | | | | | | | Unclear yet how we can map to Encounter location, but when part of a care team ROL-11 would be used, not the physical location while in the hospital. |
diff --git a/input/includes/ConceptMap-segment-rxo-to-medicationrequest-intro.md b/input/includes/ConceptMap-segment-rxo-to-medicationrequest-intro.md
index 2fb04783..95ba2e70 100644
--- a/input/includes/ConceptMap-segment-rxo-to-medicationrequest-intro.md
+++ b/input/includes/ConceptMap-segment-rxo-to-medicationrequest-intro.md
@@ -17,7 +17,7 @@ This ConceptMap represents the mapping from the HL7 V2 RXO Segment to the FHIR M
6 | RXO-6 | Provider's Pharmacy/Treatment Instructions | CWE | 0 | -1 | | | | | | | | | | | | |
7 | RXO-7 | Provider's Administration Instructions | CWE | 0 | -1 | | | | | | | | | | | | |
8 | RXO-8 | Deliver-To Location | CM | 0 | 1 | | | | | | | | | | | | |
-9 | RXO-9 | Allow Substitutions | ID | 0 | 1 | | | | MedicationRequest.substitution.allowedCodeableConcept | | MedicationRequest.CodeableConcept | | | ID[CodeableConcept] | AllowSubstition | | |
+9 | RXO-9 | Allow Substitutions | ID | 0 | 1 | | | | MedicationRequest.substitution.allowedCodeableConcept | | MedicationRequest.CodeableConcept | | | ID[CodeableConcept] | AllowSubstitution | | |
10 | RXO-10 | Requested Dispense Code | CWE | 0 | 1 | | | | | | | | | | | | |
11 | RXO-11 | Requested Dispense Amount | NM | 0 | 1 | | | | MedicationRequest.dispenseRequest.quantity.value | | MedicationRequest.decimal | | | | | | |
12 | RXO-12 | Requested Dispense Units | CWE | 0 | 1 | IF RXO-12.1 IS VALUED OR RXO-12.3 IS VALUED | | | MedicationRequest.dispenseRequest.quantity.code | | MedicationRequest.code | | | CWE[Code] | RequestedDispenseUnits | | |
diff --git a/input/pagecontent/datatype_maps.md b/input/pagecontent/datatype_maps.md
index a6125a5a..685f2d41 100644
--- a/input/pagecontent/datatype_maps.md
+++ b/input/pagecontent/datatype_maps.md
@@ -53,6 +53,7 @@ is described in the section on [mapping](#mapping) at the bottom of this page.
* [EI[UDICarrier]](ConceptMap-datatype-ei-udicarrier-to-device.html) - Entity Identifier to FHIR [Device](http://hl7.org/fhir/R4/device.html)
* [FN](ConceptMap-datatype-fn-to-humanname.html) - Family Name to FHIR [HumanName](http://hl7.org/fhir/R4/datatypes.html#humanname)
* [FT[Comment]](ConceptMap-datatype-ft-comment-to-annotation.html) - Formatted Text Data to FHIR [Annotation](http://hl7.org/fhir/R4/datatypes.html#annotation)
+* [HD](ConceptMap-datatype-hd-to-device.html) - Hierarchic Designator to FHIR [Device](http://hl7.org/fhir/R4/device.html)
* [HD](ConceptMap-datatype-hd-to-identifier.html) - Hierarchic Designator to FHIR [Identifier](http://hl7.org/fhir/R4/datatypes.html#identifier)
* [HD](ConceptMap-datatype-hd-to-location.html) - Hierarchic Designator to FHIR [Location](http://hl7.org/fhir/R4/location.html)
* [HD](ConceptMap-datatype-hd-to-organization.html) - Hierarchic Designator to FHIR [Organization](http://hl7.org/fhir/R4/organization.html)
diff --git a/input/pagecontent/segment_maps.md b/input/pagecontent/segment_maps.md
index de530a24..e3747dd1 100644
--- a/input/pagecontent/segment_maps.md
+++ b/input/pagecontent/segment_maps.md
@@ -68,6 +68,7 @@ is described in the section on [mapping](#mapping) at the bottom of this page.
* [DG1](ConceptMap-segment-dg1-to-encounter.html) - Diagnosis to FHIR [Encounter](http://hl7.org/fhir/R4/encounter.html)
* [DG1](ConceptMap-segment-dg1-to-episodeofcare.html) - Diagnosis to FHIR [EpisodeOfCare](http://hl7.org/fhir/R4/episodeofcare.html)
* [IN1](ConceptMap-segment-in1-to-coverage.html) - Insurance to FHIR [Coverage](http://hl7.org/fhir/R4/coverage.html)
+* [IN3](ConceptMap-segment-in3-to-careteam.html) - Insurance Additional Information, Certification to FHIR [CareTeam](http://hl7.org/fhir/R4/careteam.html)
* [PR1](ConceptMap-segment-pr1-to-procedure.html) - Procedures to FHIR [Procedure](http://hl7.org/fhir/R4/procedure.html)
### Chapter 7 Observation Reporting
diff --git a/mappings/codesystems/HL7 Concept Map_ ParticipantOrganizationUnitType - Sheet1.csv b/mappings/codesystems/HL7 Concept Map_ ParticipantOrganizationUnitType - Sheet1.csv
new file mode 100644
index 00000000..d6fa1e7a
--- /dev/null
+++ b/mappings/codesystems/HL7 Concept Map_ ParticipantOrganizationUnitType - Sheet1.csv
@@ -0,0 +1,21 @@
+HL7 v2,,,Condition (IF TRUE),,HL7 FHIR,,
+Code,Text,Code System,Computable,Narrative,Code,Display,Code System
+H,Home,HL70406,,,,,
+O,Office,HL70406,,,,,
+1,Hospital,HL70406,,,,,
+2,Physician Clinic,HL70406,,,,,
+3,Long Term Care,HL70406,,,,,
+4,Acute Care,HL70406,,,,,
+5,Other,HL70406,,,,,
+,,,,,prov,Healthcare Provider,An organization that provides healthcare services.
+,,,,,dept,Hospital Department,A department or ward within a hospital (Generally is not applicable to top level organizations)
+,,,,,team,Organizational team,"An organizational team is usually a grouping of practitioners that perform a specific function within an organization (which could be a top level organization, or a department)."
+,,,,,govt,Government,"A political body, often used when including organization records for government bodies such as a Federal Government, State or Local Government."
+,,,,,ins,Insurance Company,A company that provides insurance to its subscribers that may include healthcare related policies.
+,,,,,pay,Payer,"A company, charity, or governmental organization, which processes claims and/or issues payments to providers on behalf of patients or groups of patients."
+,,,,,edu,Educational Institute,An educational institution that provides education or research facilities.
+,,,,,reli,Religious Institution,An organization that is identified as a part of a religious institution.
+,,,,,crs,Clinical Research Sponsor,An organization that is identified as a Pharmaceutical/Clinical Research Sponsor.
+,,,,,cg,Community Group,An un-incorporated community group.
+,,,,,bus,Non-Healthcare Business or Corporation,An organization that is a registered business or corporation but not identified by other types.
+,,,,,other,Other,Other type of organization not already specified.
\ No newline at end of file
diff --git a/mappings/codesystems/filetourl.properties b/mappings/codesystems/filetourl.properties
index 82576145..249526ed 100644
--- a/mappings/codesystems/filetourl.properties
+++ b/mappings/codesystems/filetourl.properties
@@ -1,4 +1,4 @@
-#Mon Dec 09 12:27:51 CST 2024
+#Mon Dec 09 14:14:08 CST 2024
HL7\ Concept\ Map_\ MessageStructure\ -\ Sheet1.csv=https\://docs.google.com/spreadsheets/d/1LYij-5qBuSU-iTSRt-gVDWlvGzGvb61jqO5RZmYQJgA/edit?gid\=0\#gid\=0
HL7\ Concept\ Map_\ PrincipalLanguageOfMessage\ -\ Sheet1.csv=https\://docs.google.com/spreadsheets/d/1zPHUFEcOLuIhdG1yyDGDpYd-LAuUKn9hdJNlqYPTkGc/edit\#gid\=0
HL7\ Concept\ Map_\ ModeOfArrivalCode\ -\ Sheet1.csv=https\://docs.google.com/spreadsheets/d/1cq-jINNYePVc6dACBzBbFzTv7ry8e6w8ZXgHmmW7WeE/edit\#gid\=0
@@ -78,6 +78,7 @@ HL7\ Concept\ Map_\ OrderType\ -\ Sheet1.csv=https\://docs.google.com/spreadshee
HL7\ Concept\ Map_\ AllergenType[AllergyIntoleranceCategory]\ -\ Sheet1.csv=https\://docs.google.com/spreadsheets/d/1kRIGg82psj97HFzQx5-t34LbHBzhAQzFqM1BT2uNVSI/edit?gid\=0\#gid\=0
HL7\ Concept\ Map_\ DiagnosticServiceSectionID\ -\ Sheet1.csv=https\://docs.google.com/spreadsheets/d/190IK3DXu5_bpGgesA5ZZ_YxN009gyutbuT5yztzB3BI/edit\#gid\=0
HL7\ Concept\ Map_\ TelecommunicationUseCode\ -\ Sheet1.csv=https\://docs.google.com/spreadsheets/d/1EE3a5UIGXLi8wMDr49fWTEVx8QS2GFqYgitE3vLOQTQ/edit\#gid\=0
+HL7\ Concept\ Map_\ ParticipantOrganizationUnitType\ -\ Sheet1.csv=https\://docs.google.com/spreadsheets/d/1maxr5ZKoj33VRuyeTX8KbzLBK4iSboPMK2bJ0toIDkY/edit?gid\=0\#gid\=0
HL7\ Concept\ Map_\ DietType\ -\ Sheet1.csv=https\://docs.google.com/spreadsheets/d/1U784ZQS6EZfykD8AU0a5ZODn4Cbh9YV0i7uB9bZADho/edit\#gid\=0
HL7\ Concept\ Map_\ AllergySeverity[AllergyIntolerance.criticality-original]\ -\ Sheet1.csv=https\://docs.google.com/spreadsheets/d/1F3YGZuimTTxay5ngXQKu2Gvy5VvEom5xLvtWvHWJbkk/edit\#gid\=0
HL7\ Concept\ Map_\ PlanId\ -\ Sheet1.csv=https\://docs.google.com/spreadsheets/d/1odWyxmpwkTeQeTapaaDWSLtz_p6T_Jd_lPFrQvJQvBI/edit\#gid\=0
diff --git a/mappings/datatypes/HL7 Data Type - FHIR R4_ HD[Device] - Sheet1.csv b/mappings/datatypes/HL7 Data Type - FHIR R4_ HD[Device] - Sheet1.csv
new file mode 100644
index 00000000..c2208f62
--- /dev/null
+++ b/mappings/datatypes/HL7 Data Type - FHIR R4_ HD[Device] - Sheet1.csv
@@ -0,0 +1,7 @@
+HL7 v2,,,,,,Condition (IF True),,,HL7 FHIR,,,,,,,,,Comments
+Sort Order,Identifier,Name,Data Type,Cardinality - Min,Cardinality - Max,Computable ANTLR,Computable FHIRPath,Narrative,FHIR Attribute/ Data Type,,Data Type,Cardinality - Min,Cardinality - Max,Data Type Mapping,"Vocabulary Mapping
+(IS, ID, CE, CNE, CWE)",Assignment,,
+1,HD.1,Namespace ID,IS,0,1,,,,identifier[1].value,,string,,,,,,,Need gForge (#20522) to change MessageHeader.destination.endpoint from 1..1 to 0..1. Must be a reachable address.
+2,HD.2,Universal ID,ST,0,1,,,,identifier[2].value,,string,,,,,,,
+3,HD.3,Universal ID Type,ID,0,1,,,,identifier[2].type,,CodeableConcept,,,ID[CodeableConcept-UniversalID],UniversalIDType,,,"Request that DNS, ISO, and UUID (and other Table 0301 values) are added to: http://hl7.org/fhir/valueset-identifier-type.html"
+3,HD.3,Universal ID Type,ID,0,1,"IF HD.3 IN (""ISO"", ""UUID"")",,,identifier[2].system,,uri,,,,,"""urn:ietf:rfc:3986""",,
\ No newline at end of file
diff --git a/mappings/datatypes/filetourl.properties b/mappings/datatypes/filetourl.properties
index 081a7a7e..b6eba132 100644
--- a/mappings/datatypes/filetourl.properties
+++ b/mappings/datatypes/filetourl.properties
@@ -1,4 +1,4 @@
-#Mon Dec 09 12:26:35 CST 2024
+#Mon Dec 09 14:12:56 CST 2024
HL7\ Data\ Type\ -\ FHIR\ R4_\ ID[boolean]\ -\ Sheet1.csv=https\://docs.google.com/spreadsheets/d/12tPvyla2Ion3sHXGxbbX3OdLpKI8BYpHfsuUKIuqHvk/edit\#gid\=0
HL7\ Data\ Type\ -\ FHIR\ R4_\ CWE[Coding]\ -\ Sheet1.csv=https\://docs.google.com/spreadsheets/d/16EsPaP--u_j82g6YeV81ZHcJdzk0EzNbNs_hTdkek_A/edit\#gid\=0
HL7\ Data\ Type\ -\ FHIR\ R4_\ CX[string]\ -\ Sheet1.csv=https\://docs.google.com/spreadsheets/d/1IWUHkEnYB8mCCwzvO9cyt0OGsvIBUG0IAygcMgvInPk/edit\#gid\=0
@@ -41,6 +41,7 @@ HL7\ Data\ Type\ -\ FHIR\ R4_\ HD[MessageHeader.destination-endpoint]\ -\ Sheet1
HL7\ Data\ Type\ -\ FHIR\ R4_\ NM[Quantity-LengthOfStay]\ -\ Sheet1.csv=https\://docs.google.com/spreadsheets/d/10xbEUhs5LEydlRYgH_Ok_9y8Vn_b3peUxFfHJLtNMmI/edit\#gid\=0
HL7\ Data\ Type\ -\ FHIR\ R4_\ CX[Identifier]\ -\ Sheet1.csv=https\://docs.google.com/spreadsheets/d/1wZsWZMw0kBpu-oWB1U3iljL0m_7PLGM9tFfSqBUoRU4/edit\#gid\=0
HL7\ Data\ Type\ -\ FHIR\ R4_\ PT[Meta]\ -\ Sheet1.csv=https\://docs.google.com/spreadsheets/d/1WAGzkLwwhJJGdsry9llddsgZpwjs3D1xoeir_guRVKI/edit\#gid\=0
+HL7\ Data\ Type\ -\ FHIR\ R4_\ HD[Device]\ -\ Sheet1.csv=https\://docs.google.com/spreadsheets/d/17DkmOwfcOoVQObJa39jY65XiEbXR7ozzvlgw6S_S0a4/edit?gid\=0\#gid\=0
HL7\ Data\ Type\ -\ FHIR\ R4_\ ID[CodeableConcept]\ -\ Sheet1.csv=https\://docs.google.com/spreadsheets/d/1lKNOp9adRZq86xYTl1U_VtsIr4qTUmETR2sU3S9Ie8M/edit\#gid\=0
HL7\ Data\ Type\ -\ FHIR\ R4_\ CQ[code]\ -\ Sheet1.csv=https\://docs.google.com/spreadsheets/d/1BFNRs6fNoqFyXGmzfYB1-G3SGCMuHXuLAk0vXQyittQ/edit\#gid\=0
HL7\ Data\ Type\ -\ FHIR\ R4_\ CF[CodeableConcept]\ -\ Sheet1.csv=https\://docs.google.com/spreadsheets/d/10noQAsbbgOydDvG2Kk6CiPddQYLfNev2uwufgiSsaoc/edit\#gid\=0
diff --git a/mappings/messages/filetourl.properties b/mappings/messages/filetourl.properties
index 3c5d776a..1ef73b47 100644
--- a/mappings/messages/filetourl.properties
+++ b/mappings/messages/filetourl.properties
@@ -1,4 +1,4 @@
-#Mon Dec 09 12:26:44 CST 2024
+#Mon Dec 09 14:13:04 CST 2024
HL7\ Message\ -\ FHIR\ R4_\ SIU-S12\ -\ Sheet1.csv=https\://docs.google.com/spreadsheets/d/1kbcOetUxBZWvGNxHAmJgjZFMoDVNHvJufAEs8-p4y24/edit\#gid\=0
HL7\ Message\ -\ FHIR\ R4_\ ADT_A09\ -\ Sheet1.csv=https\://docs.google.com/spreadsheets/d/1lFfoksYBm2Pbfs4PvDtCHkbuQgTL1Ooj4jREYFLK6Lc/edit\#gid\=0
HL7\ Message\ -\ FHIR\ R4_\ MDM\ _T02\ -\ Sheet1.csv=https\://docs.google.com/spreadsheets/d/1KXumJbfcuuPNcbMjp2esj2kJSj-RkU8CqQYhUfXrp9c/edit\#gid\=0
diff --git a/mappings/segments/HL7 Segment - FHIR R4_ IN3[CareTeam] - Sheet1.csv b/mappings/segments/HL7 Segment - FHIR R4_ IN3[CareTeam] - Sheet1.csv
new file mode 100644
index 00000000..c8c60b54
--- /dev/null
+++ b/mappings/segments/HL7 Segment - FHIR R4_ IN3[CareTeam] - Sheet1.csv
@@ -0,0 +1,32 @@
+HL7 v2,,,,,,Condition (IF True),,,HL7 FHIR,,,,,,,,,Comments
+Sort Order,Identifier,Name,Data Type,Cardinality - Min,Cardinality - Max,Computable ANTLR,Computable FHIRPath,Narrative,FHIR Attribute,,Data Type,Cardinality - Min,Cardinality - Max,Data Type Mapping,"Vocabulary Mapping
+(IS, ID, CE, CNE, CWE)",Assignment,,
+1,IN3-1,Set ID - IN3,SI,1,1,,,,,,,,,,,,,
+2,IN3-2,Certification Number,CX,0,1,,,,,,,,,,,,,
+3,IN3-3,Certified By,XCN,0,-1,,,,,,,,,,,,,
+4,IN3-4,Certification Required,ID,0,1,,,,,,,,,,Yes/NoIndicator,,,
+5,IN3-5,Penalty,MOP,0,1,,,,,,,,,,,,,
+6,IN3-6,Certification Date/Time,DTM,0,1,,,,,,,,,,,,,
+7,IN3-7,Certification Modify Date/Time,DTM,0,1,,,,,,,,,,,,,
+8,IN3-8,Operator,XCN,0,-1,,,,,,,,,,,,,
+9,IN3-9,Certification Begin Date,DT,0,1,,,,,,,,,,,,,
+10,IN3-10,Certification End Date,DT,0,1,,,,,,,,,,,,,
+11,IN3-11,Days,DTN,0,1,,,,,,,,,,,,,
+12,IN3-12,Non-Concur Code/Description,CWE,0,1,,,,,,,,,,,,,
+13,IN3-13,Non-Concur Effective Date/Time,DTM,0,1,,,,,,,,,,,,,
+14,IN3-14,Physician Reviewer,XCN,0,-1,,,,,,,,,,,,,
+15,IN3-15,Certification Contact,ST,0,1,,,,,,,,,,,,,
+16,IN3-16,Certification Contact Phone Number,XTN,0,-1,,,,,,,,,,,,,
+17,IN3-17,Appeal Reason,CWE,0,1,,,,,,,,,,,,,
+18,IN3-18,Certification Agency,CWE,0,1,,,,,,,,,,,,,
+19,IN3-19,Certification Agency Phone Number,XTN,0,-1,,,,,,,,,,,,,
+20,IN3-20,Pre-Certification Requirement,ICD,0,-1,,,,,,,,,,,,,
+21,IN3-21,Case Manager,ST,0,1,,,,participant.role.coding.value,,string,,,,,"""768832004""",,
+21,IN3-21,Case Manager,ST,0,1,,,,participant.role.coding.system,,uri,,,,,"""http://snomed.info/sct""",,
+21,IN3-21,Case Manager,ST,0,1,,,,participant.role.text,,,,,,,"""case manager""",,
+22,IN3-22,Second Opinion Date,DT,0,1,,,,,,,,,,,,,
+23,IN3-23,Second Opinion Status,CWE,0,1,,,,,,,,,,,,,
+24,IN3-24,Second Opinion Documentation Received,CWE,0,-1,,,,,,,,,,,,,
+25,IN3-25,Second Opinion Physician,XCN,0,-1,,,,,,,,,,,,,
+26,IN3-26,Certification Type,CWE,0,1,,,,,,,,,,,,,
+27,IN3-27,Certification Category,CWE,0,1,,,,,,,,,,,,,
\ No newline at end of file
diff --git a/mappings/segments/HL7 Segment - FHIR R4_ OBX[Observation-Component] - OBX.csv b/mappings/segments/HL7 Segment - FHIR R4_ OBX[Observation-Component] - OBX.csv
index fa45459b..3047f07f 100644
--- a/mappings/segments/HL7 Segment - FHIR R4_ OBX[Observation-Component] - OBX.csv
+++ b/mappings/segments/HL7 Segment - FHIR R4_ OBX[Observation-Component] - OBX.csv
@@ -2,7 +2,7 @@ HL7 v2,,,,,,Condition (IF True),,,HL7 FHIR,,,,,,,,,Comments
Sort Order,Identifier,Name,Data Type,Cardinality - Min,Cardinality - Max,Computable ANTLR,Computable FHIRPath,Narrative,FHIR Attribute,,Data Type,Cardinality - Min,Cardinality - Max,Data Type Mapping,"Vocabulary Mapping
(IS, ID, CE, CNE, CWE)",Assignment,,
1,OBX-1,Set ID – OBX,SI,0,1,,,,,,,,,,,,,
-2,OBX-2,Value Type,ID,0,1,,,,,,,,,,ValueType,,,OBX-2 determines the flavor of Observation.value[x] is used in OBX-5
+2,OBX-2,Value Type,ID,0,1,,,,,,,,,,,,,OBX-2 determines the flavor of Observation.value[x] is used in OBX-5
3,OBX-3,Observation Identifier,CWE,1,1,,,,code,,CodeableConcept,1,1,CWE[CodeableConcept],,,,
3,OBX-3,Observation Identifier,CWE,1,1,,,,component[each].code,,CodeableConcept,1,1,CWE[CodeableConcept],,,,
4,OBX-4,Observation Sub-ID,ST,0,1,,,"Map to Observation.partOf or Observation.hasMember or Observation.DerivedFrom according to the implementation guidance for the v2 message at hand, otherwise map to the extension-sub-id to enable the final destination to determine how to structure the observations.",$this,,,,,OG[Extension-Subidentifier],,,,"OBX-4 Sub Identifier would determine how to use Observation.partOf or Observation.hasMember or Observation.DerivedFrom, but is highly dependent on the local implementation of OBX-4 or an implementation guide (e.g., LRI, Clinical Genomics). That is not known at the standard level, so we cannot provide specific mapping guidance here. However, if the mapper does not have access to the syntax used and its meaning, we need to be able to pass on OBX-4 Sub Identifier to the final destination that should know how to then structure it using FHIR attributes."
diff --git a/mappings/segments/HL7 Segment - FHIR R4_ RXO[MedicationRequest] - Sheet1.csv b/mappings/segments/HL7 Segment - FHIR R4_ RXO[MedicationRequest] - Sheet1.csv
index 0bdffd09..b4fbb6d2 100644
--- a/mappings/segments/HL7 Segment - FHIR R4_ RXO[MedicationRequest] - Sheet1.csv
+++ b/mappings/segments/HL7 Segment - FHIR R4_ RXO[MedicationRequest] - Sheet1.csv
@@ -14,7 +14,7 @@ Sort Order,Identifier,Name,Data Type,Cardinality - Min,Cardinality - Max,Computa
6,RXO-6,Provider's Pharmacy/Treatment Instructions,CWE,0,-1,,,,,,,,,,,,,
7,RXO-7,Provider's Administration Instructions,CWE,0,-1,,,,,,,,,,,,,
8,RXO-8,Deliver-To Location,CM,0,1,,,,,,,,,,,,,
-9,RXO-9,Allow Substitutions,ID,0,1,,,,substitution.allowedCodeableConcept,,CodeableConcept,,,ID[CodeableConcept],AllowSubstition,,,
+9,RXO-9,Allow Substitutions,ID,0,1,,,,substitution.allowedCodeableConcept,,CodeableConcept,,,ID[CodeableConcept],AllowSubstitution,,,
10,RXO-10,Requested Dispense Code,CWE,0,1,,,,,,,,,,,,,
11,RXO-11,Requested Dispense Amount,NM,0,1,,,,dispenseRequest.quantity.value,,decimal,,,,,,,
12,RXO-12,Requested Dispense Units,CWE,0,1,IF RXO-12.1 IS VALUED OR RXO-12.3 IS VALUED,,,dispenseRequest.quantity.code,,code,,,CWE[Code],RequestedDispenseUnits,,,
diff --git a/mappings/segments/filetourl.properties b/mappings/segments/filetourl.properties
index 310ab15c..250373b2 100644
--- a/mappings/segments/filetourl.properties
+++ b/mappings/segments/filetourl.properties
@@ -1,4 +1,4 @@
-#Mon Dec 09 12:24:58 CST 2024
+#Mon Dec 09 14:11:43 CST 2024
HL7\ Segment\ -\ FHIR\ R4_\ MSH[MessageHeader]\ -\ R4.csv=https\://docs.google.com/spreadsheets/d/13pgda5xl-PwCgB9j0axyymwwv7RJVcrIzY8Ah1y1Y1M/edit\#gid\=0
HL7\ Segment\ -\ FHIR\ R4_\ MSH[Provenance-Transformation]\ -\ Sheet1.csv=https\://docs.google.com/spreadsheets/d/1byfzqOfOvIVdRkHv2Tto5a-a0YMYWWP0eryaZBvibIo/edit\#gid\=0
HL7\ Segment\ -\ FHIR\ R4_\ MSH[Encounter]\ -\ Sheet1.csv=https\://docs.google.com/spreadsheets/d/1fXNLyF4mpBOtnmC2Y3ZvuBPf9UwL3pXWsH9mPADqn4g/edit\#gid\=0
@@ -57,6 +57,7 @@ HL7\ Segment\ -\ FHIR\ R4_\ ORC[Provenance]\ -\ ORC.csv=https\://docs.google.com
HL7\ Segment\ -\ FHIR\ R4_\ IAM[AllergyIntolerance]\ -\ Sheet1.csv=https\://docs.google.com/spreadsheets/d/1oN0BuBRmIfVQHHU6DuwnL1ZL60h6BvnXISJQ7D6akbU/edit\#gid\=0
HL7\ Segment\ -\ FHIR\ R4_\ PV1[Patient]\ -\ Sheet1.csv=https\://docs.google.com/spreadsheets/d/1SeTn6m72yUh4hho7jqN-YmuHbnO6LlGlZur7BVrpfrI/edit\#gid\=0
HL7\ Segment\ -\ FHIR\ R4_\ SPM[Specimen]\ -\ SPM.csv=https\://docs.google.com/spreadsheets/d/1RhRXhpavSHLckCYV2bJg_b0onlcjMTKLGbCb7ocsfCo/edit\#gid\=0
+HL7\ Segment\ -\ FHIR\ R4_\ IN3[CareTeam]\ -\ Sheet1.csv=https\://docs.google.com/spreadsheets/d/1kWvcYxTaofNaqq5k5qjsqBEQRsjGGKiwAyCoTc8ADhY/edit\#gid\=0
HL7\ Segment\ -\ FHIR\ R4_\ OBR[ServiceRequest]\ -\ OBR.csv=https\://docs.google.com/spreadsheets/d/1SW1j6qBHTbXJu4W56GCGMtO03ln3Z8ohyG9wY-AOX90/edit\#gid\=0
HL7\ Segment\ -\ FHIR\ R4_\ IN1[Coverage]\ -\ Sheet1.csv=https\://docs.google.com/spreadsheets/d/1-8U35_8X9wQTQAchyVAujF4TFrbcjyDeloU2gpHT2_o/edit\#gid\=0
HL7\ Segment\ -\ FHIR\ R4_\ PD1[Patient]\ -\ PD1.csv=https\://docs.google.com/spreadsheets/d/1SieDEcKFbQbB2N7c3elw4JTTDFAAwZDklwnGT5Y8tGE/edit\#gid\=0