diff --git a/input/fsh/alias.fsh b/input/fsh/alias.fsh
index 45aee4cca..c63bcec11 100644
--- a/input/fsh/alias.fsh
+++ b/input/fsh/alias.fsh
@@ -54,4 +54,7 @@ Alias: $EpisodeOfCareID = http://moh.gov.et/fhir/hiv/identifier/episode-of-care
 Alias: $EACGiven = http://moh.gov.et/fhir/hiv/CodeSystem/eac-given-code-system
 Alias: $TBScreeningDiagnosticTest = http://moh.gov.et/fhir/hiv/CodeSystem/tb-screening-diagnostic-test-type-code-system
 Alias: $ReferenceRangeMeaning = http://terminology.hl7.org/CodeSystem/referencerange-meaning
-Alias: $TPTAlternateProphylaxisType = http://moh.gov.et/fhir/hiv/CodeSystem/tpt-alternate-prophylaxis-type-code-system
\ No newline at end of file
+Alias: $TPTAlternateProphylaxisType = http://moh.gov.et/fhir/hiv/CodeSystem/tpt-alternate-prophylaxis-type-code-system
+Alias: $ListCodeCodeSystem = http://terminology.hl7.org/CodeSystem/list-example-use-codes
+Alias: $ConditionCategoryCodeSystem = http://terminology.hl7.org/CodeSystem/condition-category
+Alias: $ConditionClinicalStatusCodeSystem = http://terminology.hl7.org/CodeSystem/condition-clinical
\ No newline at end of file
diff --git a/input/fsh/examples.fsh b/input/fsh/examples.fsh
index ab8c02134..906898bbb 100644
--- a/input/fsh/examples.fsh
+++ b/input/fsh/examples.fsh
@@ -3934,4 +3934,41 @@ Description: "Indicates the activities associated with the requests for cervical
 * encounter = Reference(GeneralEncounterExample)
 * activity[+].reference = Reference(CervicalCancerScreeningServiceRequestForVIAExample)
 * activity[=].reference = Reference(CervicalCancerTreatmentServiceRequestForVIAExample)
-* activity[=].outcomeReference = Reference(CervicalCancerTreatmentReceivedForVIAExample)
\ No newline at end of file
+* activity[=].outcomeReference = Reference(CervicalCancerTreatmentReceivedForVIAExample)
+
+Instance: OpportunisicInfectionsPulmonaryTBExample
+InstanceOf: OpportunisicInfections
+Usage: #example
+Title: "Condition - Pulmonary Tuberculosis"
+Description: "Indicates that the patient suffering from pulmonary tuberculosis."
+* code = $SCT#154283005
+* category = $ConditionCategoryCodeSystem#problem-list-item
+* subject = Reference(GeneralPatientExample)
+* encounter = Reference(GeneralEncounterExample)
+* recordedDate = "2024-03-20"
+* clinicalStatus = $ConditionClinicalStatusCodeSystem#active
+
+Instance: OpportunisicInfectionsChronicDiarrheaExample
+InstanceOf: OpportunisicInfections
+Usage: #example
+Title: "Condition - Chronic Diarrhea"
+Description: "Indicates that the patient suffering from chronic diarrhea."
+* code = $SCT#236071009
+* category = $ConditionCategoryCodeSystem#problem-list-item
+* subject = Reference(GeneralPatientExample)
+* encounter = Reference(GeneralEncounterExample)
+* recordedDate = "2024-03-20"
+* clinicalStatus = $ConditionClinicalStatusCodeSystem#active
+
+Instance: OIMedicalHistoryExample
+InstanceOf: OIMedicalHistory
+Usage: #example
+Title: "List - Medical History"
+Description: "Documents the medical history for the patient"
+* code = $ListCodeCodeSystem#problems
+* subject = Reference(GeneralPatientExample)
+* encounter = Reference(GeneralEncounterExample)
+* date = "2024-03-20"
+* source = Reference(GeneralPractitionerExample)
+* entry[+].item = Reference(OpportunisicInfectionsPulmonaryTBExample)
+* entry[+].item = Reference(OpportunisicInfectionsChronicDiarrheaExample)
\ No newline at end of file
diff --git a/input/fsh/profiles.fsh b/input/fsh/profiles.fsh
index a99549375..1b3501975 100644
--- a/input/fsh/profiles.fsh
+++ b/input/fsh/profiles.fsh
@@ -2786,4 +2786,42 @@ Description: "Records the medication history for the patient receiving TPT medic
 * medication[x] only Reference
 * medicationReference only Reference(TPTMedication)
 * reasonReference 1..1
-* reasonReference only Reference(TBProphylaxisTypeObservation)
\ No newline at end of file
+* reasonReference only Reference(TBProphylaxisTypeObservation)
+
+Profile: OpportunisicInfections
+Parent: Condition
+Id: opportunisic-infection
+Title: "Condition - Opportunisic Infection"
+Description: "Captures the opportunisic infections that the patient suffering from."
+* code 1..1
+* code from OpportunisticInfectionsValueSet (required)
+* category 1..1
+* category = $ConditionCategoryCodeSystem#problem-list-item
+* subject 1..1
+* subject only Reference(EthPatient)
+* encounter 1..1
+* encounter only Reference(TargetFacilityEncounter)
+* recordedDate 1..1
+* clinicalStatus 1..1
+
+Profile: OIMedicalHistory
+Parent: List
+Id: oi-medical-history
+Title: "List - Medical History"
+Description: "Documents the medical history for the patient"
+* status = #current
+* mode = #working
+* title 1..1
+* title = "Medical History"
+* code 1..1
+* code = $ListCodeCodeSystem#problems
+* subject 1..1
+* subject only Reference(EthPatient)
+* encounter 1..1
+* encounter only Reference(TargetFacilityEncounter)
+* date 1..1
+* source 1..1
+* source only Reference(GeneralPractitioner)
+* entry 1..*
+* entry.item only Reference(OpportunisicInfections)
+
diff --git a/input/fsh/terminology.fsh b/input/fsh/terminology.fsh
index 73930718d..b5440da95 100644
--- a/input/fsh/terminology.fsh
+++ b/input/fsh/terminology.fsh
@@ -2011,4 +2011,28 @@ Id: eac-given-value-set
 Title: "EAC Given"
 Description: "Codes used for representing the EAC given."
 * ^experimental = false
-* include codes from system EACGivenCodeSystem
\ No newline at end of file
+* include codes from system EACGivenCodeSystem
+
+ValueSet: OpportunisticInfectionsValueSet
+Id: oi-value-set
+Title: "Opportunistic Infections"
+Description: "Codes used for representing opportunistic infections."
+* ^experimental = false
+* $SCT#4740000 "Herpes zoster"
+* $SCT#423997002 "Tuberculosis, extrapulmonary"
+* $SCT#154283005 "Pulmonary tuberculosis"
+* $SCT#72934000 "Candidiasis of vagina"
+* $SCT#236071009 "Chronic diarrhea"
+* $SCT#192701001 "Toxoplasma encephalitis"
+* $SCT#109385007 "Kaposi's sarcoma"
+* $SCT#415125002 "Pneumocystosis jirovecii pneumonia"
+* $SCT#95589007 "Ulcers of male genital organs"
+* $SCT#95595008 "Ulcers of female genital organs"
+* $SCT#53084003 "Bacterial pneumonia"
+* $SCT#20639004 "Candidiasis of the esophagus"
+* $SCT#26284000 "Ulcer of mouth"
+* $SCT#409966000 "Acute diarrhea"
+* $SCT#14232007 "Cryptococcal meningitis"
+* $SCT#363354003 "Malignant tumor of cervix"
+* $SCT#79740000 "Candidiasis of mouth"
+* $SCT#118601006 "Non-Hodgkin's lymphoma"
\ No newline at end of file