diff --git a/resources/seeds/Mapping/patient-edit-extract.yaml b/resources/seeds/Mapping/patient-edit-extract.yaml
index 9e9832f..a1f51af 100644
--- a/resources/seeds/Mapping/patient-edit-extract.yaml
+++ b/resources/seeds/Mapping/patient-edit-extract.yaml
@@ -20,6 +20,9 @@ body:
     firstName: >-
       $
       fhirpath("QuestionnaireResponse.repeat(item).where(linkId='first-name').answer.valueString").0
+    address: >-
+      $
+      fhirpath("QuestionnaireResponse.repeat(item).where(linkId='address').answer.valueString").0
     patientId: >-
       $
       fhirpath("QuestionnaireResponse.repeat(item).where(linkId='patient-id').answer.valueString").0
@@ -29,7 +32,7 @@ body:
     entry:
       - request:
           url: $ "/Patient/" + patientId
-          method: PUT
+          method: PATCH
         resource:
           name:
             - given:
@@ -45,5 +48,7 @@ body:
           identifier:
               - $ appleIdentifier
           active: true
+          address:
+            - text: $ address
           resourceType: Patient
     resourceType: Bundle
diff --git a/resources/seeds/Questionnaire/authorization-for-release-of-medical-images.yaml b/resources/seeds/Questionnaire/authorization-for-release-of-medical-images.yaml
index 889db3e..7ca9989 100644
--- a/resources/seeds/Questionnaire/authorization-for-release-of-medical-images.yaml
+++ b/resources/seeds/Questionnaire/authorization-for-release-of-medical-images.yaml
@@ -10,10 +10,21 @@ launchContext:
       code: Patient
     type:
       - Patient
+mapping:
+  - id: patient-edit-extract
+    resourceType: Mapping
 item:
+  - linkId: patient-id
+    type: string
+    text: patientId
+    readOnly: true
+    hidden: true
+    initialExpression:
+      language: text/fhirpath
+      expression: "%Patient.id"
   - text: 'Authorization to Use and Disclose Protected Health Information'
     type: display
-    linkId: AOjGTi2c
+    linkId: authorizationToUse
   - text: >-
       Research Study Title: Elucidating the Impact of Social Wellness and
       Artificial Intelligence on the Psychological Consequences of Breast Cancer
@@ -26,28 +37,49 @@ item:
   - text: 'Co-Investigator: Amoy Fraser, PhD'
     type: display
     linkId: coInvestigator
-  - text: Name of Research Participant
+  - text: Research Participant
+    type: display
+    linkId: researchParticipant
+  - linkId: first-name
     type: string
-    linkId: participantName
-  - text: Date of Birth
-    type: date
-    linkId: dateOfBirth
-  - text: Street Address
+    text: First name
+    required: true
+    initialExpression:
+      language: text/fhirpath
+      expression: "%Patient.name.given[0]"
+  - linkId: last-name
     type: string
-    linkId: streetAddress
-  - text: City, State & Zip Code
+    text: Last name
+    required: true
+    initialExpression:
+      language: text/fhirpath
+      expression: "%Patient.name.family"
+  - linkId: birth-date
+    type: date
+    text: Birth date
+    required: true
+    initialExpression:
+      language: text/fhirpath
+      expression: "%Patient.birthDate"
+  - text: Street Address, City, State & Zip Code
     type: string
-    linkId: cityStateZip
+    linkId: address
+    required: true
+    initialExpression:
+      language: text/fhirpath
+      expression: "%Patient.address.text"
   - text: >-
       By signing this form, I voluntarily authorize ____________________________
       to release my radiographic breast cancer imaging and related health
       information taken on or
     type: string
+    required: true
     linkId: authorizationRelease
   - text: >-
       about_____________________ (approximate dates of imaging) to University of
       Central Florida.
     type: date
+    required: true
     linkId: useForResearch
   - text: >-
       By signing this form, I voluntarily authorize, give my permission and
@@ -63,26 +95,22 @@ item:
       I have read all pages of this form and agree to the disclosures above from
       the types of sources listed.
     type: boolean
+    required: true
     linkId: readAgreeDisclosure
   - text: >-
       Print Name of Participant or Participant’s Legal Representative (if
       applicable)
     type: string
+    required: true
     linkId: printName
   - text: Signature of Participant or Participant’s Legal Representative
     type: string
+    required: true
     linkId: signature
   - text: 'Date Signed '
     type: date
+    required: true
     linkId: dateSigned
-  - text: PatientId
-    type: string
-    hidden: true
-    linkId: patientId
-    initialExpression:
-      language: text/fhirpath
-      expression: '%Patient.id'
-
 meta:
   profile:
     - https://beda.software/beda-emr-questionnaire
diff --git a/resources/seeds/Questionnaire/patient-edit.yaml b/resources/seeds/Questionnaire/patient-edit.yaml
index db238bb..9c3ded8 100644
--- a/resources/seeds/Questionnaire/patient-edit.yaml
+++ b/resources/seeds/Questionnaire/patient-edit.yaml
@@ -23,6 +23,7 @@ item:
   - linkId: first-name
     type: string
     text: First name
+    required: true
     initialExpression:
       language: text/fhirpath
       expression: "%Patient.name.given[0]"