diff --git a/input/fsh/examples/BDPatientExample.fsh b/input/fsh/examples/BDPatientExample.fsh
index 11d7a8b..e9c8ec7 100644
--- a/input/fsh/examples/BDPatientExample.fsh
+++ b/input/fsh/examples/BDPatientExample.fsh
@@ -30,10 +30,10 @@ Description: "A minimal example for a patient satisfying name translations and a
 * address[0].country = "BD"
 
 // The "Division" extension (Must match the name in BDAddress)
-* address[0].extension[division].valueCodeableConcept = https://fhir.dghs.gov.bd/core/CodeSystem/bd-geo-codes#30 "Dhaka"
+* address[0].extension[division].valueCodeableConcept = https://fhir.dghs.gov.bd/core/CodeSystem/bd-geocodes#30 "Dhaka"
 
 // The "Upazilla" extension (Must match the name in BDAddress)
-* address[0].extension[upazilla].valueCodeableConcept = https://fhir.dghs.gov.bd/core/CodeSystem/bd-geo-codes#3026 "Dhamrai"
+* address[0].extension[upazilla].valueCodeableConcept = https://fhir.dghs.gov.bd/core/CodeSystem/bd-geocodes#3026 "Dhamrai"
 
 // Optional Religion Extension
 * extension[religion].valueCodeableConcept = https://fhir.dghs.gov.bd/core/CodeSystem/bd-religions-cs#islam "Islam"
\ No newline at end of file
diff --git a/input/fsh/extensions/division.fsh b/input/fsh/extensions/division.fsh
index 63be219..4922e33 100644
--- a/input/fsh/extensions/division.fsh
+++ b/input/fsh/extensions/division.fsh
@@ -6,5 +6,5 @@ Description: "BD Division"
 Context: Address
 
 
-* value[x] only string
-* value[x] from BDDivisionsVS
\ No newline at end of file
+* value[x] only CodeableConcept
+valueCodeableConcept from BDDivisionsVS (required)
\ No newline at end of file
diff --git a/input/fsh/extensions/upazilla.fsh b/input/fsh/extensions/upazilla.fsh
index a1c1a33..f417dca 100644
--- a/input/fsh/extensions/upazilla.fsh
+++ b/input/fsh/extensions/upazilla.fsh
@@ -6,5 +6,5 @@ Description: "BD Upazilla"
 Context: Address
 
 
-* value[x] only string
-* value[x] from BDUpazillasVS
\ No newline at end of file
+* value[x] only CodeableConcept
+* valueCodeableConcept from BDUpazillasVS (required)
\ No newline at end of file
diff --git a/input/fsh/profile/BDPatient.fsh b/input/fsh/profile/BDPatient.fsh
index 3badb69..6d8f983 100644
--- a/input/fsh/profile/BDPatient.fsh
+++ b/input/fsh/profile/BDPatient.fsh
@@ -51,7 +51,7 @@ Patient profile for Bangladesh.
 * identifier[NID].system = "http://dghs.gov.bd/identifier/nid"
 * identifier[NID].type.coding.code = #NID
 // * identifier[NID].type.coding.system = "http://terminology.hl7.org/CodeSystem/v2-0203"
-* identifier[NID].type.coding.system = "https://fhir.dghs.gov.bd/core/ValueSet/bd-identifier-type-valueset"
+* identifier[NID].type.coding.system = "https://fhir.dghs.gov.bd/core/CodeSystem/bd-identifier-type"
 * identifier[NID].type from BangladeshIdentifierTypeVS (extensible)
 * identifier[NID].type.text = "Organization identifier"
 // * identifier[NID].value = "Personal identifier National ID"
@@ -61,7 +61,7 @@ Patient profile for Bangladesh.
 
 * identifier[BRN].system = "http://dghs.gov.bd/identifier/brn"
 * identifier[BRN].type.coding.code = #BRN
-* identifier[BRN].type.coding.system = "https://fhir.dghs.gov.bd/core/ValueSet/bd-identifier-type-valueset"
+* identifier[BRN].type.coding.system = "https://fhir.dghs.gov.bd/core/CodeSystem/bd-identifier-type"
 * identifier[BRN].type from BangladeshIdentifierTypeVS (extensible)
 * identifier[BRN].type.text = "Organization identifier"
 // * identifier[BRN].value = "Personal identifier Birth Registration"
@@ -69,7 +69,7 @@ Patient profile for Bangladesh.
 
 * identifier[UHID].system = "http://dghs.gov.bd/identifier/uhid"
 * identifier[UHID].type.coding.code = #UHID
-* identifier[UHID].type.coding.system = "https://fhir.dghs.gov.bd/core/ValueSet/bd-identifier-type-valueset"
+* identifier[UHID].type.coding.system = "https://fhir.dghs.gov.bd/core/CodeSystem/bd-identifier-type"
 * identifier[UHID].type from BangladeshIdentifierTypeVS (extensible)
 * identifier[UHID].type.text = "Organization identifier"
 
diff --git a/input/fsh/profile/bdAddress.fsh b/input/fsh/profile/bdAddress.fsh
index 325f051..1c507d5 100644
--- a/input/fsh/profile/bdAddress.fsh
+++ b/input/fsh/profile/bdAddress.fsh
@@ -10,8 +10,10 @@ Description: "Address for Bangladesh Standard"
 
 * country 1..1 MS
 * extension contains Division named division 1..1 MS
+* extension[division] ^short = "Division code"
 
 * district 1..1 MS
 * district from BDDistrictsVS
 
-* extension contains Upazillas named upazilla 1..1 MS
\ No newline at end of file
+* extension contains Upazillas named upazilla 1..1 MS
+* extension[upazilla] ^short = "Upazilla code"
\ No newline at end of file