diff --git a/src/specifications/profile-resolution/profile-resolution-examples/catalogs/abc-full_catalog.xml b/src/specifications/profile-resolution/profile-resolution-examples/catalogs/abc-full_catalog.xml
index 522d779ebf..c0ffe9ce3d 100644
--- a/src/specifications/profile-resolution/profile-resolution-examples/catalogs/abc-full_catalog.xml
+++ b/src/specifications/profile-resolution/profile-resolution-examples/catalogs/abc-full_catalog.xml
@@ -30,19 +30,16 @@
             <label>a1.a parameter</label>
             <value>a1.a value</value>
          </param>
-         <prop name="place" value="1st"/>
+         <prop name="label" value="1st"/>
          <part name="statement" id="a1-stmt">
             <p>A1 aaaaa aaaaaaaaaa</p>
-            <p>Parameter A.a is set: <insert type="param" id-ref="param-A.a"/>
-            </p>
-            <p>Parameter a1.a is set: <insert type="param" id-ref="param-a1.a"/>
-            </p>
-            <p>Also, we <a href="#citation">refer to a citation</a>.</p>
+            <p>Parameter A.a is set: <insert type="param" id-ref="param-A.a"/></p>
+            <p>Parameter a1.a is set: <insert type="param" id-ref="param-a1.a"/></p>
          </part>
       </control>
       <control id="a2">
          <title>Control A2</title>
-         <prop name="place" value="2nd"/>
+         <prop name="label" value="2nd"/>
          <part name="statement" id="a2-stmt">
             <p>A2 aaa aaaaaaaaaa aaaaaaaaaaaaa</p>
             <p>Parameter A.b is set: <insert type="param" id-ref="param-A.b"/>
@@ -51,7 +48,7 @@
       </control>
       <control id="a3">
          <title>Control A3</title>
-         <prop name="place" value="3rd"/>
+         <prop name="label" value="3rd"/>
          <part name="statement" id="a3-stmt">
             <p>A3 aaaaa aaaaaaaaaa</p>
          </part>
@@ -61,21 +58,23 @@
       <title>Group B of C</title>
       <control id="b1">
          <title>Control B1</title>
-         <prop name="place" value="4th"/>
+         <prop name="label" value="4th"/>
          <part name="statement" id="b1-stmt">
             <p>B1 bbbb bbbbbbb.</p>
          </part>
       </control>
       <control id="b2">
          <title>Control B2</title>
-         <prop name="place" value="5th"/>
+         <prop name="label" value="5th"/>
+         <link rel="citation" href="#4a3990e7-2020-4b8f-902c-d679ebea2b58"/>
          <part name="statement" id="b2-stmt">
             <p>B2 bbb bbbbbbbbbbb bbbbbbbbbbbb.</p>
+            <p>Also, we <a href="#4a3990e7-2020-4b8f-902c-d679ebea2b58">refer to a citation</a>.</p>
          </part>
       </control>
       <control id="b3">
          <title>Control B3</title>
-         <prop name="place" value="6th"/>
+         <prop name="label" value="6th"/>
          <part name="statement" id="b3-stmt">
             <p>B3 bbbb bbbbbbb bbbb.</p>
          </part>
@@ -85,15 +84,15 @@
       <title>Group C of C</title>
       <control id="c1">
          <title>Control C1</title>
-         <prop name="place" value="7th"/>
+         <prop name="label" value="7th"/>
          <part name="statement" id="c1-stmt">
             <p>C1 ccccc ccc ccccccccccccccccc.</p>
-            <p>We cite a document with an anchor: <a href="#citation">... citation ...</a>.</p>
+            <p>We cite a document with an anchor: <a href="somedoc#citation">... citation ...</a>.</p>
          </part>
       </control>
       <control id="c2">
          <title>Control C2</title>
-         <prop name="place" value="8th"/>
+         <prop name="label" value="8th"/>
          <link rel="citation" href="#ef4c1cf0-a3cc-4354-bdd5-690466f61d4f"/>
          <part name="statement" id="c2-stmt">
             <p>C2 cccccccc ccccccccccccccccc.</p>
@@ -101,19 +100,19 @@
       </control>
       <control id="c3">
          <title>Control C3</title>
-         <prop name="place" value="9th"/>
+         <prop name="label" value="9th"/>
          <part name="statement" id="c3-stmt">
             <p>C3 ccccc cccccccccccccc.</p>
          </part>
          <control id="c3.a">
             <title>Control C3-A</title>
-            <prop name="place" value="10th"/>
+            <prop name="label" value="10th"/>
             <part name="statement" id="c3-stmt">
                <p>C3 A ccccc cccccccccccccc.</p>
             </part>
             <control id="c3.a-1">
                <title>Control C3-A-1</title>
-               <prop name="place" value="11th"/>
+               <prop name="label" value="11th"/>
                <part name="statement" id="c3-stmt">
                   <p>C3 A-1 ccccc cccccccccccccc.</p>
                </part>
@@ -122,10 +121,21 @@
       </control>
    </group>
    <back-matter>
+      <resource uuid="4a3990e7-2020-4b8f-902c-d679ebea2b58">
+         <citation>
+            <text>A citation to an out of line document.</text>
+         </citation>
+      </resource>
       <resource uuid="ef4c1cf0-a3cc-4354-bdd5-690466f61d4f">
          <citation>
             <text>A citation to an out of line document.</text>
          </citation>
       </resource>
+      <resource uuid="70830fd9-7899-40f8-acfe-70a5d1a56353">
+      	 <prop name="keep" value="always"/>
+         <citation>
+            <text>A citation to an out of line document.</text>
+         </citation>
+      </resource>
    </back-matter>
 </catalog>
diff --git a/src/specifications/profile-resolution/profile-resolution-examples/catalogs/abc-simple_catalog.xml b/src/specifications/profile-resolution/profile-resolution-examples/catalogs/abc-simple_catalog.xml
index b41aef92db..b838be9ad0 100644
--- a/src/specifications/profile-resolution/profile-resolution-examples/catalogs/abc-simple_catalog.xml
+++ b/src/specifications/profile-resolution/profile-resolution-examples/catalogs/abc-simple_catalog.xml
@@ -18,14 +18,14 @@
          <param id="a1_prm1">
             <label>A1 Parameter 1</label>
          </param>
-         <prop name="place" value="first"/>
+         <prop name="label" value="first"/>
          <part name="statement" id="a1-stmt">
             <p>A1 aaaaa aaaaaaaaaa</p>
          </part>
       </control>
       <control id="a2">
          <title>Control A2</title>
-         <prop name="place" value="second"/>
+         <prop name="label" value="second"/>
          <part name="statement" id="a2-stmt">
             <p>A2 aaa aaaaaaaaaa aaaaaaaaaaaaa</p>
          </part>
@@ -35,7 +35,7 @@
          <param id="a3_prm1">
             <label>A3 Parameter 1</label>
          </param>
-         <prop name="place" value="third"/>
+         <prop name="label" value="third"/>
          <part name="statement" id="a3-stmt">
             <p>A3 aaaaa aaaaaaaaaa</p>
          </part>
@@ -45,21 +45,21 @@
       <title>Group B of C</title>
       <control id="b1">
          <title>Control B1</title>
-         <prop name="place" value="fourth"/>
+         <prop name="label" value="fourth"/>
          <part name="statement" id="b1-stmt">
             <p>B1 bbbb bbbbbbb.</p>
          </part>
       </control>
       <control id="b2">
          <title>Control B2</title>
-         <prop name="place" value="fifth"/>
+         <prop name="label" value="fifth"/>
          <part name="statement" id="b2-stmt">
             <p>B2 bbb bbbbbbbbbbb bbbbbbbbbbbb.</p>
          </part>
       </control>
       <control id="b3">
          <title>Control B3</title>
-         <prop name="place" value="sixth"/>
+         <prop name="label" value="sixth"/>
          <part name="statement" id="b3-stmt">
             <p>B3 bbbb bbbbbbb bbbb.</p>
          </part>
@@ -69,33 +69,33 @@
       <title>Group C of C</title>
       <control id="c1">
          <title>Control C1</title>
-         <prop name="place" value="seventh"/>
+         <prop name="label" value="seventh"/>
          <part name="statement" id="c1-stmt">
             <p>C1 ccccc ccc ccccccccccccccccc.</p>
          </part>
       </control>
       <control id="c2">
          <title>Control C2</title>
-         <prop name="place" value="eighth"/>
+         <prop name="label" value="eighth"/>
          <part name="statement" id="c2-stmt">
             <p>C2 cccccccc ccccccccccccccccc.</p>
          </part>
       </control>
       <control id="c3">
          <title>Control C3</title>
-         <prop name="place" value="ninth"/>
+         <prop name="label" value="ninth"/>
          <part name="statement" id="c3-stmt">
             <p>C3 ccccc cccccccccccccc.</p>
          </part>
          <control id="c3.a">
             <title>Control C3-A</title>
-            <prop name="place" value="tenth"/>
+            <prop name="label" value="tenth"/>
             <part name="statement" id="c3-stmt">
                <p>C3 A ccccc cccccccccccccc.</p>
             </part>
             <control id="c3.a-1">
                <title>Control C3-A-1</title>
-               <prop name="place" value="eleventh"/>
+               <prop name="label" value="eleventh"/>
                <part name="statement" id="c3-stmt">
                   <p>C3 A-1 ccccc cccccccccccccc.</p>
                </part>
diff --git a/src/specifications/profile-resolution/profile-resolution-examples/include-all-test_profile.xml b/src/specifications/profile-resolution/profile-resolution-examples/include-all-test_profile.xml
index 10c801ae2c..c6c699df9d 100644
--- a/src/specifications/profile-resolution/profile-resolution-examples/include-all-test_profile.xml
+++ b/src/specifications/profile-resolution/profile-resolution-examples/include-all-test_profile.xml
@@ -12,4 +12,7 @@
    <import href="catalogs/abc-full_catalog.xml">
       <include-all/>
    </import>
+   <merge>
+      <as-is>true</as-is>
+   </merge>
 </profile>
diff --git a/src/specifications/profile-resolution/profile-resolution-examples/merge-keep-resources_profile.xml b/src/specifications/profile-resolution/profile-resolution-examples/merge-keep-resources_profile.xml
index b062ac37ec..358f84f829 100644
--- a/src/specifications/profile-resolution/profile-resolution-examples/merge-keep-resources_profile.xml
+++ b/src/specifications/profile-resolution/profile-resolution-examples/merge-keep-resources_profile.xml
@@ -12,12 +12,12 @@
    <import href="#01ecd6cc-e281-472c-bb7a-0394bdf938f2">
       <include-controls>
          <with-id>a1</with-id>
-         <with-id>b1</with-id>
+         <with-id>b2</with-id>
       </include-controls>
    </import>
    <back-matter>
       <resource uuid="01ecd6cc-e281-472c-bb7a-0394bdf938f2">
-         <rlink href="catalogs/abc-simple_catalog.xml"/>
+         <rlink href="catalogs/abc-full_catalog.xml"/>
       </resource>
       <resource uuid="761205f0-fd61-42d3-9c66-2fb89e844a19">
          <title>Risk Management Framework for Information Systems and Organizations: A System Life Cycle Approach for Security and Privacy</title>
diff --git a/src/specifications/profile-resolution/profile-resolution-examples/output-expected/base-test_profile_RESOLVED.xml b/src/specifications/profile-resolution/profile-resolution-examples/output-expected/base-test_profile_RESOLVED.xml
index be7795892a..ba4c5907ae 100644
--- a/src/specifications/profile-resolution/profile-resolution-examples/output-expected/base-test_profile_RESOLVED.xml
+++ b/src/specifications/profile-resolution/profile-resolution-examples/output-expected/base-test_profile_RESOLVED.xml
@@ -6,57 +6,55 @@
       <last-modified>2021-04-06T15:00:48.692-04:00</last-modified>
       <version>1.0</version>
       <oscal-version>1.0.0</oscal-version>
-      <link rel="resolution-source" href="base-test_profile.xml"/>
+      <prop name="resolution-tool" value="some value"/>
+      <link rel="source-profile" href="../base-test_profile.xml"/>
    </metadata>
    <control id="a1">
       <title>Control A1</title>
-      <param id="a1_prm1">
-         <label>A1 Parameter 1</label>
-      </param>
-      <prop name="place" value="first"/>
+      <prop name="label" value="first"/>
       <part name="statement" id="a1-stmt">
          <p>A1 aaaaa aaaaaaaaaa</p>
       </part>
    </control>
    <control id="b1">
       <title>Control B1</title>
-      <prop name="place" value="fourth"/>
+      <prop name="label" value="fourth"/>
       <part name="statement" id="b1-stmt">
          <p>B1 bbbb bbbbbbb.</p>
       </part>
    </control>
    <control id="c1">
       <title>Control C1</title>
-      <prop name="place" value="seventh"/>
+      <prop name="label" value="seventh"/>
       <part name="statement" id="c1-stmt">
          <p>C1 ccccc ccc ccccccccccccccccc.</p>
       </part>
    </control>
    <control id="c3">
       <title>Control C3</title>
-      <prop name="place"
+      <prop name="label"
          value="ninth" />
       <part name="statement"
          id="c3-stmt">
          <p>C3 ccccc cccccccccccccc.</p>
       </part>
-      <control id="c3.a">
-         <title>Control C3-A</title>
-         <prop name="place"
-            value="tenth" />
-         <part name="statement"
-            id="c3-stmt">
-            <p>C3 A ccccc cccccccccccccc.</p>
-         </part>
-         <control id="c3.a-1">
-            <title>Control C3-A-1</title>
-            <prop name="place"
-               value="eleventh" />
-            <part name="statement"
-               id="c3-stmt">
-               <p>C3 A-1 ccccc cccccccccccccc.</p>
-            </part>
-         </control>
-      </control>
+   </control>
+   <control id="c3.a">
+      <title>Control C3-A</title>
+      <prop name="label"
+         value="tenth" />
+      <part name="statement"
+         id="c3-stmt">
+         <p>C3 A ccccc cccccccccccccc.</p>
+      </part>
+   </control>
+   <control id="c3.a-1">
+      <title>Control C3-A-1</title>
+      <prop name="label"
+         value="eleventh" />
+      <part name="statement"
+         id="c3-stmt">
+         <p>C3 A-1 ccccc cccccccccccccc.</p>
+      </part>
    </control>
 </catalog>
diff --git a/src/specifications/profile-resolution/profile-resolution-examples/output-expected/base2-test_profile_RESOLVED.xml b/src/specifications/profile-resolution/profile-resolution-examples/output-expected/base2-test_profile_RESOLVED.xml
index 8e5e6948f4..282ff94354 100644
--- a/src/specifications/profile-resolution/profile-resolution-examples/output-expected/base2-test_profile_RESOLVED.xml
+++ b/src/specifications/profile-resolution/profile-resolution-examples/output-expected/base2-test_profile_RESOLVED.xml
@@ -6,35 +6,33 @@
       <last-modified>2021-04-06T15:00:49.259-04:00</last-modified>
       <version>1.0</version>
       <oscal-version>1.0.0</oscal-version>
-      <link rel="resolution-source" href="base2-test_profile.xml"/>
+      <prop name="resolution-tool" value="some value"/>
+      <link rel="source-profile" href="../base2-test_profile.xml"/>
    </metadata>
    <control id="a1">
       <title>Control A1</title>
-      <param id="a1_prm1">
-         <label>A1 Parameter 1</label>
-      </param>
-      <prop name="place" value="first"/>
+      <prop name="label" value="first"/>
       <part name="statement" id="a1-stmt">
          <p>A1 aaaaa aaaaaaaaaa</p>
       </part>
    </control>
    <control id="b1">
       <title>Control B1</title>
-      <prop name="place" value="fourth"/>
+      <prop name="label" value="fourth"/>
       <part name="statement" id="b1-stmt">
          <p>B1 bbbb bbbbbbb.</p>
       </part>
    </control>
    <control id="c1">
       <title>Control C1</title>
-      <prop name="place" value="seventh"/>
+      <prop name="label" value="seventh"/>
       <part name="statement" id="c1-stmt">
          <p>C1 ccccc ccc ccccccccccccccccc.</p>
       </part>
    </control>
    <control id="c3">
       <title>Control C3</title>
-      <prop name="place" value="ninth"/>
+      <prop name="label" value="ninth"/>
       <part name="statement" id="c3-stmt">
          <p>C3 ccccc cccccccccccccc.</p>
       </part>
diff --git a/src/specifications/profile-resolution/profile-resolution-examples/output-expected/broken_profile_RESOLVED.xml b/src/specifications/profile-resolution/profile-resolution-examples/output-expected/broken_profile_RESOLVED.xml
index df127be426..012fe3972b 100644
--- a/src/specifications/profile-resolution/profile-resolution-examples/output-expected/broken_profile_RESOLVED.xml
+++ b/src/specifications/profile-resolution/profile-resolution-examples/output-expected/broken_profile_RESOLVED.xml
@@ -6,6 +6,7 @@
       <last-modified>2021-04-06T15:00:49.676-04:00</last-modified>
       <version>1.0</version>
       <oscal-version>1.0.0</oscal-version>
-      <link rel="resolution-source" href="broken_profile.xml"/>
+      <prop name="resolution-tool" value="some value"/>
+      <link rel="source-profile" href="../broken_profile.xml"/>
    </metadata>
 </catalog>
diff --git a/src/specifications/profile-resolution/profile-resolution-examples/output-expected/circular_profile_RESOLVED.xml b/src/specifications/profile-resolution/profile-resolution-examples/output-expected/circular_profile_RESOLVED.xml
index 87db19e179..c6c08e2fe1 100644
--- a/src/specifications/profile-resolution/profile-resolution-examples/output-expected/circular_profile_RESOLVED.xml
+++ b/src/specifications/profile-resolution/profile-resolution-examples/output-expected/circular_profile_RESOLVED.xml
@@ -6,6 +6,7 @@
       <last-modified>2021-04-06T15:00:49.96-04:00</last-modified>
       <version>1.0</version>
       <oscal-version>1.0.0</oscal-version>
-      <link rel="resolution-source" href="circular_profile.xml"/>
+      <prop name="resolution-tool" value="some value"/>
+      <link rel="source-profile" href="../circular_profile.xml"/>
    </metadata>
 </catalog>
diff --git a/src/specifications/profile-resolution/profile-resolution-examples/output-expected/exclude-call-test_profile_RESOLVED.xml b/src/specifications/profile-resolution/profile-resolution-examples/output-expected/exclude-call-test_profile_RESOLVED.xml
index 6a9e9c0917..14b60e834b 100644
--- a/src/specifications/profile-resolution/profile-resolution-examples/output-expected/exclude-call-test_profile_RESOLVED.xml
+++ b/src/specifications/profile-resolution/profile-resolution-examples/output-expected/exclude-call-test_profile_RESOLVED.xml
@@ -6,79 +6,77 @@
       <last-modified>2021-04-06T15:00:50.316-04:00</last-modified>
       <version>1.0</version>
       <oscal-version>1.0.0</oscal-version>
-      <link rel="resolution-source" href="exclude-call-test_profile.xml"/>
+      <prop name="resolution-tool" value="some value"/>
+      <link rel="source-profile" href="../exclude-call-test_profile.xml"/>
    </metadata>
    <control id="a2">
       <title>Control A2</title>
-      <prop name="place" value="second"/>
+      <prop name="label" value="second"/>
       <part name="statement" id="a2-stmt">
          <p>A2 aaa aaaaaaaaaa aaaaaaaaaaaaa</p>
       </part>
    </control>
    <control id="a3">
       <title>Control A3</title>
-      <param id="a3_prm1">
-         <label>A3 Parameter 1</label>
-      </param>
-      <prop name="place" value="third"/>
+      <prop name="label" value="third"/>
       <part name="statement" id="a3-stmt">
          <p>A3 aaaaa aaaaaaaaaa</p>
       </part>
    </control>
    <control id="b1">
       <title>Control B1</title>
-      <prop name="place" value="fourth"/>
+      <prop name="label" value="fourth"/>
       <part name="statement" id="b1-stmt">
          <p>B1 bbbb bbbbbbb.</p>
       </part>
    </control>
    <control id="b2">
       <title>Control B2</title>
-      <prop name="place" value="fifth"/>
+      <prop name="label" value="fifth"/>
       <part name="statement" id="b2-stmt">
          <p>B2 bbb bbbbbbbbbbb bbbbbbbbbbbb.</p>
       </part>
    </control>
    <control id="b3">
       <title>Control B3</title>
-      <prop name="place" value="sixth"/>
+      <prop name="label" value="sixth"/>
       <part name="statement" id="b3-stmt">
          <p>B3 bbbb bbbbbbb bbbb.</p>
       </part>
    </control>
    <control id="c1">
       <title>Control C1</title>
-      <prop name="place" value="seventh"/>
+      <prop name="label" value="seventh"/>
       <part name="statement" id="c1-stmt">
          <p>C1 ccccc ccc ccccccccccccccccc.</p>
       </part>
    </control>
    <control id="c2">
       <title>Control C2</title>
-      <prop name="place" value="eighth"/>
+      <prop name="label" value="eighth"/>
       <part name="statement" id="c2-stmt">
          <p>C2 cccccccc ccccccccccccccccc.</p>
       </part>
    </control>
    <control id="c3">
       <title>Control C3</title>
-      <prop name="place" value="ninth"/>
+      <prop name="label" value="ninth"/>
       <part name="statement" id="c3-stmt">
          <p>C3 ccccc cccccccccccccc.</p>
       </part>
-      <control id="c3.a">
-         <title>Control C3-A</title>
-         <prop name="place" value="tenth"/>
-         <part name="statement" id="c3-stmt">
-            <p>C3 A ccccc cccccccccccccc.</p>
-         </part>
-         <control id="c3.a-1">
-            <title>Control C3-A-1</title>
-            <prop name="place" value="eleventh"/>
-            <part name="statement" id="c3-stmt">
-               <p>C3 A-1 ccccc cccccccccccccc.</p>
-            </part>
-         </control>
-      </control>
+   </control>
+   <control id="c3.a">
+      <title>Control C3-A</title>
+      <prop name="label" value="tenth"/>
+      <part name="statement" id="c3-stmt">
+         <p>C3 A ccccc cccccccccccccc.</p>
+      </part>
+   </control>
+   <control id="c3.a-1">
+      <title>Control C3-A-1</title>
+      <prop name="label" value="eleventh"/>
+      <part name="statement" id="c3-stmt">
+         <p>C3 A-1 ccccc cccccccccccccc.</p>
+      </part>
    </control>
 </catalog>
diff --git a/src/specifications/profile-resolution/profile-resolution-examples/output-expected/full-test_profile_RESOLVED.xml b/src/specifications/profile-resolution/profile-resolution-examples/output-expected/full-test_profile_RESOLVED.xml
index 12f9ea4553..e05bbe6443 100644
--- a/src/specifications/profile-resolution/profile-resolution-examples/output-expected/full-test_profile_RESOLVED.xml
+++ b/src/specifications/profile-resolution/profile-resolution-examples/output-expected/full-test_profile_RESOLVED.xml
@@ -6,42 +6,54 @@
       <last-modified>2021-04-06T15:00:50.63-04:00</last-modified>
       <version>1.0</version>
       <oscal-version>1.0.0</oscal-version>
-      <link rel="resolution-source" href="full-test_profile.xml"/>
+      <prop name="resolution-tool" value="some value"/>
+      <link rel="source-profile" href="../full-test_profile.xml"/>
    </metadata>
+   <param id="param-A.a">
+      <label>A.a parameter</label>
+      <value>A.a value</value>
+   </param>
    <control id="a1">
       <title>Control A1</title>
       <param id="param-a1.a">
          <label>a1.a parameter</label>
          <value>a1.a value</value>
       </param>
-      <prop name="place" value="1st"/>
+      <prop name="label" value="1st"/>
       <part name="statement" id="a1-stmt">
          <p>A1 aaaaa aaaaaaaaaa</p>
-         <p>Parameter A.a is set: <insert type="param" id-ref="param-A.a"/>...</p>
-         <p>Parameter a1.a is set: <insert type="param" id-ref="param-a1.a"/>...</p>
-         <p>Also, we <a href="#citation">refer to a citation</a>.</p>
+         <p>Parameter A.a is set: <insert type="param" id-ref="param-A.a"/></p>
+         <p>Parameter a1.a is set: <insert type="param" id-ref="param-a1.a"/></p>
       </part>
    </control>
    <control id="b1">
       <title>Control B1</title>
-      <prop name="place" value="4th"/>
+      <prop name="label" value="4th"/>
       <part name="statement" id="b1-stmt">
          <p>B1 bbbb bbbbbbb.</p>
       </part>
    </control>
    <control id="c1">
       <title>Control C1</title>
-      <prop name="place" value="7th"/>
+      <prop name="label" value="7th"/>
       <part name="statement" id="c1-stmt">
          <p>C1 ccccc ccc ccccccccccccccccc.</p>
-         <p>We cite a document with an anchor: <a href="#citation">... citation ...</a>.</p>
+         <p>We cite a document with an anchor: <a href="somedoc#citation">... citation ...</a>.</p>
       </part>
    </control>
    <control id="c3">
       <title>Control C3</title>
-      <prop name="place" value="9th"/>
+      <prop name="label" value="9th"/>
       <part name="statement" id="c3-stmt">
          <p>C3 ccccc cccccccccccccc.</p>
       </part>
    </control>
+   <back-matter>
+      <resource uuid="70830fd9-7899-40f8-acfe-70a5d1a56353">
+      	 <prop name="keep" value="always"/>
+         <citation>
+            <text>A citation to an out of line document.</text>
+         </citation>
+      </resource>
+   </back-matter>
 </catalog>
diff --git a/src/specifications/profile-resolution/profile-resolution-examples/output-expected/home_profile_RESOLVED.xml b/src/specifications/profile-resolution/profile-resolution-examples/output-expected/home_profile_RESOLVED.xml
index 14d6ffe505..db8d94f3b4 100644
--- a/src/specifications/profile-resolution/profile-resolution-examples/output-expected/home_profile_RESOLVED.xml
+++ b/src/specifications/profile-resolution/profile-resolution-examples/output-expected/home_profile_RESOLVED.xml
@@ -6,6 +6,7 @@
       <last-modified>2021-04-06T15:00:50.936-04:00</last-modified>
       <version>1.0</version>
       <oscal-version>1.0.0</oscal-version>
-      <link rel="resolution-source" href="home_profile.xml"/>
+      <prop name="resolution-tool" value="some value"/>
+      <link rel="source-profile" href="../home_profile.xml"/>
    </metadata>
 </catalog>
diff --git a/src/specifications/profile-resolution/profile-resolution-examples/output-expected/import-twice_profile_RESOLVED.xml b/src/specifications/profile-resolution/profile-resolution-examples/output-expected/import-twice_profile_RESOLVED.xml
index cae4377852..ba2af7bf12 100644
--- a/src/specifications/profile-resolution/profile-resolution-examples/output-expected/import-twice_profile_RESOLVED.xml
+++ b/src/specifications/profile-resolution/profile-resolution-examples/output-expected/import-twice_profile_RESOLVED.xml
@@ -6,56 +6,54 @@
       <last-modified>2021-04-06T15:00:51.268-04:00</last-modified>
       <version>1.0</version>
       <oscal-version>1.0.0</oscal-version>
-      <link rel="resolution-source" href="import-twice_profile.xml"/>
+      <prop name="resolution-tool" value="some value"/>
+      <link rel="source-profile" href="../import-twice_profile.xml"/>
    </metadata>
    <control id="a1">
       <title>Control A1</title>
-      <param id="a1_prm1">
-         <label>A1 Parameter 1</label>
-      </param>
-      <prop name="place" value="first"/>
+      <prop name="label" value="first"/>
       <part name="statement" id="a1-stmt">
          <p>A1 aaaaa aaaaaaaaaa</p>
       </part>
    </control>
    <control id="b1">
       <title>Control B1</title>
-      <prop name="place" value="fourth"/>
+      <prop name="label" value="fourth"/>
       <part name="statement" id="b1-stmt">
          <p>B1 bbbb bbbbbbb.</p>
       </part>
    </control>
    <control id="c1">
       <title>Control C1</title>
-      <prop name="place" value="seventh"/>
+      <prop name="label" value="seventh"/>
       <part name="statement" id="c1-stmt">
          <p>C1 ccccc ccc ccccccccccccccccc.</p>
       </part>
    </control>
    <control id="c3">
       <title>Control C3</title>
-      <prop name="place" value="ninth"/>
+      <prop name="label" value="ninth"/>
       <part name="statement" id="c3-stmt">
          <p>C3 ccccc cccccccccccccc.</p>
       </part>
    </control>
    <control id="b1">
       <title>Control B1</title>
-      <prop name="place" value="fourth"/>
+      <prop name="label" value="fourth"/>
       <part name="statement" id="b1-stmt">
          <p>B1 bbbb bbbbbbb.</p>
       </part>
    </control>
    <control id="c1">
       <title>Control C1</title>
-      <prop name="place" value="seventh"/>
+      <prop name="label" value="seventh"/>
       <part name="statement" id="c1-stmt">
          <p>C1 ccccc ccc ccccccccccccccccc.</p>
       </part>
    </control>
    <control id="c3">
       <title>Control C3</title>
-      <prop name="place" value="ninth"/>
+      <prop name="label" value="ninth"/>
       <part name="statement" id="c3-stmt">
          <p>C3 ccccc cccccccccccccc.</p>
       </part>
diff --git a/src/specifications/profile-resolution/profile-resolution-examples/output-expected/include-all-no-children-test_profile_RESOLVED.xml b/src/specifications/profile-resolution/profile-resolution-examples/output-expected/include-all-no-children-test_profile_RESOLVED.xml
index 94f72f228a..ed4ab1ea9d 100644
--- a/src/specifications/profile-resolution/profile-resolution-examples/output-expected/include-all-no-children-test_profile_RESOLVED.xml
+++ b/src/specifications/profile-resolution/profile-resolution-examples/output-expected/include-all-no-children-test_profile_RESOLVED.xml
@@ -6,69 +6,83 @@
       <last-modified>2021-04-06T15:00:51.584-04:00</last-modified>
       <version>1.0</version>
       <oscal-version>1.0.0</oscal-version>
-      <link rel="resolution-source" href="include-all-no-children-test_profile.xml"/>
+      <prop name="resolution-tool" value="some value"/>
+      <link rel="source-profile" href="../include-all-no-children-test_profile.xml"/>
    </metadata>
+   <param id="param-A.a">
+      <label>A.a parameter</label>
+      <value>A.a value</value>
+   </param>
+   <param id="param-A.b">
+      <select>
+         <choice>A.b parameter selection choice 1</choice>
+         <choice>A.b parameter selection choice 2</choice>
+         <choice>A.b parameter selection choice 3</choice>
+      </select>
+   </param>
    <control id="a1">
       <title>Control A1</title>
       <param id="param-a1.a">
          <label>a1.a parameter</label>
          <value>a1.a value</value>
       </param>
-      <prop name="place" value="1st"/>
+      <prop name="label" value="1st"/>
       <part name="statement" id="a1-stmt">
          <p>A1 aaaaa aaaaaaaaaa</p>
-         <p>Parameter A.a is set: <insert type="param" id-ref="param-A.a"/>...</p>
-         <p>Parameter a1.a is set: <insert type="param" id-ref="param-a1.a"/>...</p>
-         <p>Also, we <a href="#citation">refer to a citation</a>.</p>
+         <p>Parameter A.a is set: <insert type="param" id-ref="param-A.a"/></p>
+         <p>Parameter a1.a is set: <insert type="param" id-ref="param-a1.a"/></p>
       </part>
    </control>
    <control id="a2">
       <title>Control A2</title>
-      <prop name="place" value="2nd"/>
+      <prop name="label" value="2nd"/>
       <part name="statement" id="a2-stmt">
          <p>A2 aaa aaaaaaaaaa aaaaaaaaaaaaa</p>
-         <p>Parameter A.b is set: <insert type="param" id-ref="param-A.b"/>...</p>
+         <p>Parameter A.b is set: <insert type="param" id-ref="param-A.b"/>
+         </p>
       </part>
    </control>
    <control id="a3">
       <title>Control A3</title>
-      <prop name="place" value="3rd"/>
+      <prop name="label" value="3rd"/>
       <part name="statement" id="a3-stmt">
          <p>A3 aaaaa aaaaaaaaaa</p>
       </part>
    </control>
    <control id="b1">
       <title>Control B1</title>
-      <prop name="place" value="4th"/>
+      <prop name="label" value="4th"/>
       <part name="statement" id="b1-stmt">
          <p>B1 bbbb bbbbbbb.</p>
       </part>
    </control>
    <control id="b2">
       <title>Control B2</title>
-      <prop name="place" value="5th"/>
+      <prop name="label" value="5th"/>
+      <link rel="citation" href="#4a3990e7-2020-4b8f-902c-d679ebea2b58"/>
       <part name="statement" id="b2-stmt">
          <p>B2 bbb bbbbbbbbbbb bbbbbbbbbbbb.</p>
+         <p>Also, we <a href="#4a3990e7-2020-4b8f-902c-d679ebea2b58">refer to a citation</a>.</p>
       </part>
    </control>
    <control id="b3">
       <title>Control B3</title>
-      <prop name="place" value="6th"/>
+      <prop name="label" value="6th"/>
       <part name="statement" id="b3-stmt">
          <p>B3 bbbb bbbbbbb bbbb.</p>
       </part>
    </control>
    <control id="c1">
       <title>Control C1</title>
-      <prop name="place" value="7th"/>
+      <prop name="label" value="7th"/>
       <part name="statement" id="c1-stmt">
          <p>C1 ccccc ccc ccccccccccccccccc.</p>
-         <p>We cite a document with an anchor: <a href="#citation">... citation ...</a>.</p>
+         <p>We cite a document with an anchor: <a href="somedoc#citation">... citation ...</a>.</p>
       </part>
    </control>
    <control id="c2">
       <title>Control C2</title>
-      <prop name="place" value="8th"/>
+      <prop name="label" value="8th"/>
       <link rel="citation" href="#ef4c1cf0-a3cc-4354-bdd5-690466f61d4f"/>
       <part name="statement" id="c2-stmt">
          <p>C2 cccccccc ccccccccccccccccc.</p>
@@ -76,30 +90,41 @@
    </control>
    <control id="c3">
       <title>Control C3</title>
-      <prop name="place" value="9th"/>
+      <prop name="label" value="9th"/>
       <part name="statement" id="c3-stmt">
          <p>C3 ccccc cccccccccccccc.</p>
       </part>
-      <control id="c3.a">
-         <title>Control C3-A</title>
-         <prop name="place" value="10th"/>
-         <part name="statement" id="c3-stmt">
-            <p>C3 A ccccc cccccccccccccc.</p>
-         </part>
-         <control id="c3.a-1">
-            <title>Control C3-A-1</title>
-            <prop name="place" value="11th"/>
-            <part name="statement" id="c3-stmt">
-               <p>C3 A-1 ccccc cccccccccccccc.</p>
-            </part>
-         </control>
-      </control>
+   </control>
+   <control id="c3.a">
+      <title>Control C3-A</title>
+      <prop name="label" value="10th"/>
+      <part name="statement" id="c3-stmt">
+         <p>C3 A ccccc cccccccccccccc.</p>
+      </part>
+   </control>
+   <control id="c3.a-1">
+      <title>Control C3-A-1</title>
+      <prop name="label" value="11th"/>
+      <part name="statement" id="c3-stmt">
+         <p>C3 A-1 ccccc cccccccccccccc.</p>
+      </part>
    </control>
    <back-matter>
+      <resource uuid="4a3990e7-2020-4b8f-902c-d679ebea2b58">
+         <citation>
+            <text>A citation to an out of line document.</text>
+         </citation>
+      </resource>
       <resource uuid="ef4c1cf0-a3cc-4354-bdd5-690466f61d4f">
          <citation>
             <text>A citation to an out of line document.</text>
          </citation>
       </resource>
+      <resource uuid="70830fd9-7899-40f8-acfe-70a5d1a56353">
+      	 <prop name="keep" value="always"/>
+         <citation>
+            <text>A citation to an out of line document.</text>
+         </citation>
+      </resource>
    </back-matter>
 </catalog>
diff --git a/src/specifications/profile-resolution/profile-resolution-examples/output-expected/include-all-test_profile_RESOLVED.xml b/src/specifications/profile-resolution/profile-resolution-examples/output-expected/include-all-test_profile_RESOLVED.xml
index 45a907be3c..1467b2616e 100644
--- a/src/specifications/profile-resolution/profile-resolution-examples/output-expected/include-all-test_profile_RESOLVED.xml
+++ b/src/specifications/profile-resolution/profile-resolution-examples/output-expected/include-all-test_profile_RESOLVED.xml
@@ -6,100 +6,134 @@
       <last-modified>2021-04-06T15:00:51.847-04:00</last-modified>
       <version>1.0</version>
       <oscal-version>1.0.0</oscal-version>
-      <link rel="resolution-source" href="include-all-test_profile.xml"/>
+      <prop name="resolution-tool" value="some value"/>
+      <link rel="source-profile" href="../include-all-test_profile.xml"/>
    </metadata>
-   <control id="a1">
-      <title>Control A1</title>
-      <param id="param-a1.a">
-         <label>a1.a parameter</label>
-         <value>a1.a value</value>
-      </param>
-      <prop name="place" value="1st"/>
-      <part name="statement" id="a1-stmt">
-         <p>A1 aaaaa aaaaaaaaaa</p>
-         <p>Parameter A.a is set: <insert type="param" id-ref="param-A.a"/>...</p>
-         <p>Parameter a1.a is set: <insert type="param" id-ref="param-a1.a"/>...</p>
-         <p>Also, we <a href="#citation">refer to a citation</a>.</p>
-      </part>
-   </control>
-   <control id="a2">
-      <title>Control A2</title>
-      <prop name="place" value="2nd"/>
-      <part name="statement" id="a2-stmt">
-         <p>A2 aaa aaaaaaaaaa aaaaaaaaaaaaa</p>
-         <p>Parameter A.b is set: <insert type="param" id-ref="param-A.b"/>...</p>
-      </part>
-   </control>
-   <control id="a3">
-      <title>Control A3</title>
-      <prop name="place" value="3rd"/>
-      <part name="statement" id="a3-stmt">
-         <p>A3 aaaaa aaaaaaaaaa</p>
-      </part>
-   </control>
-   <control id="b1">
-      <title>Control B1</title>
-      <prop name="place" value="4th"/>
-      <part name="statement" id="b1-stmt">
-         <p>B1 bbbb bbbbbbb.</p>
-      </part>
-   </control>
-   <control id="b2">
-      <title>Control B2</title>
-      <prop name="place" value="5th"/>
-      <part name="statement" id="b2-stmt">
-         <p>B2 bbb bbbbbbbbbbb bbbbbbbbbbbb.</p>
-      </part>
-   </control>
-   <control id="b3">
-      <title>Control B3</title>
-      <prop name="place" value="6th"/>
-      <part name="statement" id="b3-stmt">
-         <p>B3 bbbb bbbbbbb bbbb.</p>
-      </part>
-   </control>
-   <control id="c1">
-      <title>Control C1</title>
-      <prop name="place" value="7th"/>
-      <part name="statement" id="c1-stmt">
-         <p>C1 ccccc ccc ccccccccccccccccc.</p>
-         <p>We cite a document with an anchor: <a href="#citation">... citation ...</a>.</p>
-      </part>
-   </control>
-   <control id="c2">
-      <title>Control C2</title>
-      <prop name="place" value="8th"/>
-      <link rel="citation" href="#ef4c1cf0-a3cc-4354-bdd5-690466f61d4f"/>
-      <part name="statement" id="c2-stmt">
-         <p>C2 cccccccc ccccccccccccccccc.</p>
-      </part>
-   </control>
-   <control id="c3">
-      <title>Control C3</title>
-      <prop name="place" value="9th"/>
-      <part name="statement" id="c3-stmt">
-         <p>C3 ccccc cccccccccccccc.</p>
-      </part>
-      <control id="c3.a">
-         <title>Control C3-A</title>
-         <prop name="place" value="10th"/>
-         <part name="statement" id="c3-stmt">
-            <p>C3 A ccccc cccccccccccccc.</p>
-         </part>
-         <control id="c3.a-1">
-            <title>Control C3-A-1</title>
-            <prop name="place" value="11th"/>
-            <part name="statement" id="c3-stmt">
-               <p>C3 A-1 ccccc cccccccccccccc.</p>
-            </part>
-         </control>
-      </control>
-   </control>
+   <group>
+      <title>Group A of C</title>
+	   <param id="param-A.a">
+	      <label>A.a parameter</label>
+	      <value>A.a value</value>
+	   </param>
+	   <param id="param-A.b">
+	      <select>
+	         <choice>A.b parameter selection choice 1</choice>
+	         <choice>A.b parameter selection choice 2</choice>
+	         <choice>A.b parameter selection choice 3</choice>
+	      </select>
+	   </param>
+	   <control id="a1">
+	      <title>Control A1</title>
+	      <param id="param-a1.a">
+	         <label>a1.a parameter</label>
+	         <value>a1.a value</value>
+	      </param>
+	      <prop name="label" value="1st"/>
+	      <part name="statement" id="a1-stmt">
+	         <p>A1 aaaaa aaaaaaaaaa</p>
+	         <p>Parameter A.a is set: <insert type="param" id-ref="param-A.a"/></p>
+	         <p>Parameter a1.a is set: <insert type="param" id-ref="param-a1.a"/></p>
+	      </part>
+	   </control>
+	   <control id="a2">
+	      <title>Control A2</title>
+	      <prop name="label" value="2nd"/>
+	      <part name="statement" id="a2-stmt">
+	         <p>A2 aaa aaaaaaaaaa aaaaaaaaaaaaa</p>
+	         <p>Parameter A.b is set: <insert type="param" id-ref="param-A.b"/>
+	         </p>
+	      </part>
+	   </control>
+	   <control id="a3">
+	      <title>Control A3</title>
+	      <prop name="label" value="3rd"/>
+	      <part name="statement" id="a3-stmt">
+	         <p>A3 aaaaa aaaaaaaaaa</p>
+	      </part>
+	   </control>
+   </group>
+   <group>
+	   <title>Group B of C</title>
+	   <control id="b1">
+	      <title>Control B1</title>
+	      <prop name="label" value="4th"/>
+	      <part name="statement" id="b1-stmt">
+	         <p>B1 bbbb bbbbbbb.</p>
+	      </part>
+	   </control>
+	   <control id="b2">
+	      <title>Control B2</title>
+	      <prop name="label" value="5th"/>
+	      <link rel="citation" href="#4a3990e7-2020-4b8f-902c-d679ebea2b58"/>
+	      <part name="statement" id="b2-stmt">
+	         <p>B2 bbb bbbbbbbbbbb bbbbbbbbbbbb.</p>
+	         <p>Also, we <a href="#4a3990e7-2020-4b8f-902c-d679ebea2b58">refer to a citation</a>.</p>
+	      </part>
+	   </control>
+	   <control id="b3">
+	      <title>Control B3</title>
+	      <prop name="label" value="6th"/>
+	      <part name="statement" id="b3-stmt">
+	         <p>B3 bbbb bbbbbbb bbbb.</p>
+	      </part>
+	   </control>
+   </group>
+   <group>
+      <title>Group C of C</title>
+	   <control id="c1">
+	      <title>Control C1</title>
+	      <prop name="label" value="7th"/>
+	      <part name="statement" id="c1-stmt">
+	         <p>C1 ccccc ccc ccccccccccccccccc.</p>
+	         <p>We cite a document with an anchor: <a href="somedoc#citation">... citation ...</a>.</p>
+	      </part>
+	   </control>
+	   <control id="c2">
+	      <title>Control C2</title>
+	      <prop name="label" value="8th"/>
+	      <link rel="citation" href="#ef4c1cf0-a3cc-4354-bdd5-690466f61d4f"/>
+	      <part name="statement" id="c2-stmt">
+	         <p>C2 cccccccc ccccccccccccccccc.</p>
+	      </part>
+	   </control>
+	   <control id="c3">
+	      <title>Control C3</title>
+	      <prop name="label" value="9th"/>
+	      <part name="statement" id="c3-stmt">
+	         <p>C3 ccccc cccccccccccccc.</p>
+	      </part>
+		   <control id="c3.a">
+		      <title>Control C3-A</title>
+		      <prop name="label" value="10th"/>
+		      <part name="statement" id="c3-stmt">
+		         <p>C3 A ccccc cccccccccccccc.</p>
+		      </part>
+			   <control id="c3.a-1">
+			      <title>Control C3-A-1</title>
+			      <prop name="label" value="11th"/>
+			      <part name="statement" id="c3-stmt">
+			         <p>C3 A-1 ccccc cccccccccccccc.</p>
+			      </part>
+			   </control>
+		   </control>
+	   </control>
+    </group>
    <back-matter>
+      <resource uuid="4a3990e7-2020-4b8f-902c-d679ebea2b58">
+         <citation>
+            <text>A citation to an out of line document.</text>
+         </citation>
+      </resource>
       <resource uuid="ef4c1cf0-a3cc-4354-bdd5-690466f61d4f">
          <citation>
             <text>A citation to an out of line document.</text>
          </citation>
       </resource>
+      <resource uuid="70830fd9-7899-40f8-acfe-70a5d1a56353">
+      	 <prop name="keep" value="always"/>
+         <citation>
+            <text>A citation to an out of line document.</text>
+         </citation>
+      </resource>
    </back-matter>
 </catalog>
diff --git a/src/specifications/profile-resolution/profile-resolution-examples/output-expected/include-call-with-children-test_profile_RESOLVED.xml b/src/specifications/profile-resolution/profile-resolution-examples/output-expected/include-call-with-children-test_profile_RESOLVED.xml
index 850a35c9ff..f07802e74a 100644
--- a/src/specifications/profile-resolution/profile-resolution-examples/output-expected/include-call-with-children-test_profile_RESOLVED.xml
+++ b/src/specifications/profile-resolution/profile-resolution-examples/output-expected/include-call-with-children-test_profile_RESOLVED.xml
@@ -1,57 +1,60 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <catalog xmlns="http://csrc.nist.gov/ns/oscal/1.0"
-         uuid="a3764a5d-4388-4363-bf58-d48464bd17bf">
+   uuid="4e44c016-f69e-4ef0-9041-7c3afc2c6ae7">
    <metadata>
       <title>Test Profile</title>
-      <last-modified>2021-04-06T15:00:52.172-04:00</last-modified>
+      <last-modified>2021-04-06T15:00:48.692-04:00</last-modified>
       <version>1.0</version>
       <oscal-version>1.0.0</oscal-version>
-      <link rel="resolution-source"
-            href="include-call-with-children-test_profile.xml"/>
+      <prop name="resolution-tool" value="some value"/>
+      <link rel="source-profile" href="../base-test_profile.xml"/>
    </metadata>
    <control id="a1">
       <title>Control A1</title>
-      <param id="a1_prm1">
-         <label>A1 Parameter 1</label>
-      </param>
-      <prop name="place" value="first"/>
+      <prop name="label" value="first"/>
       <part name="statement" id="a1-stmt">
          <p>A1 aaaaa aaaaaaaaaa</p>
       </part>
    </control>
    <control id="b1">
       <title>Control B1</title>
-      <prop name="place" value="fourth"/>
+      <prop name="label" value="fourth"/>
       <part name="statement" id="b1-stmt">
          <p>B1 bbbb bbbbbbb.</p>
       </part>
    </control>
    <control id="c1">
       <title>Control C1</title>
-      <prop name="place" value="seventh"/>
+      <prop name="label" value="seventh"/>
       <part name="statement" id="c1-stmt">
          <p>C1 ccccc ccc ccccccccccccccccc.</p>
       </part>
    </control>
    <control id="c3">
       <title>Control C3</title>
-      <prop name="place" value="ninth"/>
-      <part name="statement" id="c3-stmt">
+      <prop name="label"
+         value="ninth" />
+      <part name="statement"
+         id="c3-stmt">
          <p>C3 ccccc cccccccccccccc.</p>
       </part>
-      <control id="c3.a">
-         <title>Control C3-A</title>
-         <prop name="place" value="tenth"/>
-         <part name="statement" id="c3-stmt">
-            <p>C3 A ccccc cccccccccccccc.</p>
-         </part>
-         <control id="c3.a-1">
-            <title>Control C3-A-1</title>
-            <prop name="place" value="eleventh"/>
-            <part name="statement" id="c3-stmt">
-               <p>C3 A-1 ccccc cccccccccccccc.</p>
-            </part>
-         </control>
-      </control>
    </control>
-</catalog>
+   <control id="c3.a">
+      <title>Control C3-A</title>
+      <prop name="label"
+         value="tenth" />
+      <part name="statement"
+         id="c3-stmt">
+         <p>C3 A ccccc cccccccccccccc.</p>
+      </part>
+   </control>
+   <control id="c3.a-1">
+      <title>Control C3-A-1</title>
+      <prop name="label"
+         value="eleventh" />
+      <part name="statement"
+         id="c3-stmt">
+         <p>C3 A-1 ccccc cccccccccccccc.</p>
+      </part>
+   </control>
+</catalog>
\ No newline at end of file
diff --git a/src/specifications/profile-resolution/profile-resolution-examples/output-expected/include-loose-param-test_profile_RESOLVED.xml b/src/specifications/profile-resolution/profile-resolution-examples/output-expected/include-loose-param-test_profile_RESOLVED.xml
index a20ef91888..2051d3a49f 100644
--- a/src/specifications/profile-resolution/profile-resolution-examples/output-expected/include-loose-param-test_profile_RESOLVED.xml
+++ b/src/specifications/profile-resolution/profile-resolution-examples/output-expected/include-loose-param-test_profile_RESOLVED.xml
@@ -6,20 +6,32 @@
       <last-modified>2021-04-06T15:00:52.401-04:00</last-modified>
       <version>1.0</version>
       <oscal-version>1.0.0</oscal-version>
-      <link rel="resolution-source" href="include-loose-param-test_profile.xml"/>
+      <prop name="resolution-tool" value="some value"/>
+      <link rel="source-profile" href="../include-loose-param-test_profile.xml"/>
    </metadata>
+   <param id="param-A.a">
+      <label>A.a parameter</label>
+      <value>A.a value</value>
+   </param>
    <control id="a1">
       <title>Control A1</title>
       <param id="param-a1.a">
          <label>a1.a parameter</label>
          <value>a1.a value</value>
       </param>
-      <prop name="place" value="1st"/>
+      <prop name="label" value="1st"/>
       <part name="statement" id="a1-stmt">
          <p>A1 aaaaa aaaaaaaaaa</p>
-         <p>Parameter A.a is set: <insert type="param" id-ref="param-A.a"/>...</p>
-         <p>Parameter a1.a is set: <insert type="param" id-ref="param-a1.a"/>...</p>
-         <p>Also, we <a href="#citation">refer to a citation</a>.</p>
+         <p>Parameter A.a is set: <insert type="param" id-ref="param-A.a"/></p>
+         <p>Parameter a1.a is set: <insert type="param" id-ref="param-a1.a"/></p>
       </part>
    </control>
+   <back-matter>
+      <resource uuid="70830fd9-7899-40f8-acfe-70a5d1a56353">
+      	 <prop name="keep" value="always"/>
+         <citation>
+            <text>A citation to an out of line document.</text>
+         </citation>
+      </resource>
+   </back-matter>
 </catalog>
diff --git a/src/specifications/profile-resolution/profile-resolution-examples/output-expected/include-match-test_profile_RESOLVED.xml b/src/specifications/profile-resolution/profile-resolution-examples/output-expected/include-match-test_profile_RESOLVED.xml
index cf2af06b5c..f21d77cf83 100644
--- a/src/specifications/profile-resolution/profile-resolution-examples/output-expected/include-match-test_profile_RESOLVED.xml
+++ b/src/specifications/profile-resolution/profile-resolution-examples/output-expected/include-match-test_profile_RESOLVED.xml
@@ -6,6 +6,7 @@
       <last-modified>2021-04-06T15:00:52.649-04:00</last-modified>
       <version>1.0</version>
       <oscal-version>1.0.0</oscal-version>
-      <link rel="resolution-source" href="include-match-test_profile.xml"/>
+      <prop name="resolution-tool" value="some value"/>
+      <link rel="source-profile" href="../include-match-test_profile.xml"/>
    </metadata>
 </catalog>
diff --git a/src/specifications/profile-resolution/profile-resolution-examples/output-expected/merge-implicit-keep_profile_RESOLVED.xml b/src/specifications/profile-resolution/profile-resolution-examples/output-expected/merge-implicit-keep_profile_RESOLVED.xml
index c60632f323..d4816f91ed 100644
--- a/src/specifications/profile-resolution/profile-resolution-examples/output-expected/merge-implicit-keep_profile_RESOLVED.xml
+++ b/src/specifications/profile-resolution/profile-resolution-examples/output-expected/merge-implicit-keep_profile_RESOLVED.xml
@@ -6,38 +6,33 @@
       <last-modified>2021-04-06T15:00:52.97-04:00</last-modified>
       <version>1.0</version>
       <oscal-version>1.0.0</oscal-version>
-      <link rel="resolution-source" href="merge-implicit-keep_profile.xml"/>
+      <prop name="resolution-tool" value="some value"/>
+      <link rel="source-profile" href="../merge-implicit-keep_profile.xml"/>
    </metadata>
    <control id="a1">
       <title>Control A1</title>
-      <param id="a1_prm1">
-         <label>A1 Parameter 1</label>
-      </param>
-      <prop name="place" value="first"/>
+      <prop name="label" value="first"/>
       <part name="statement" id="a1-stmt">
          <p>A1 aaaaa aaaaaaaaaa</p>
       </part>
    </control>
    <control id="b1">
       <title>Control B1</title>
-      <prop name="place" value="fourth"/>
+      <prop name="label" value="fourth"/>
       <part name="statement" id="b1-stmt">
          <p>B1 bbbb bbbbbbb.</p>
       </part>
    </control>
    <control id="a1">
       <title>Control A1</title>
-      <param id="a1_prm1">
-         <label>A1 Parameter 1</label>
-      </param>
-      <prop name="place" value="first"/>
+      <prop name="label" value="first"/>
       <part name="statement" id="a1-stmt">
          <p>A1 aaaaa aaaaaaaaaa</p>
       </part>
    </control>
    <control id="b1">
       <title>Control B1</title>
-      <prop name="place" value="fourth"/>
+      <prop name="label" value="fourth"/>
       <part name="statement" id="b1-stmt">
          <p>B1 bbbb bbbbbbb.</p>
       </part>
diff --git a/src/specifications/profile-resolution/profile-resolution-examples/output-expected/merge-keep-resources_profile_RESOLVED.xml b/src/specifications/profile-resolution/profile-resolution-examples/output-expected/merge-keep-resources_profile_RESOLVED.xml
index 7ac3c90d65..0444e5edd6 100644
--- a/src/specifications/profile-resolution/profile-resolution-examples/output-expected/merge-keep-resources_profile_RESOLVED.xml
+++ b/src/specifications/profile-resolution/profile-resolution-examples/output-expected/merge-keep-resources_profile_RESOLVED.xml
@@ -6,23 +6,52 @@
       <last-modified>2021-04-06T15:00:53.229-04:00</last-modified>
       <version>1.0</version>
       <oscal-version>1.0.0</oscal-version>
-      <link rel="resolution-source" href="merge-keep-resources_profile.xml"/>
+      <prop name="resolution-tool" value="some value"/>
+      <link rel="source-profile" href="../merge-keep-resources_profile.xml"/>
    </metadata>
+   <param id="param-A.a">
+      <label>A.a parameter</label>
+      <value>A.a value</value>
+   </param>
    <control id="a1">
       <title>Control A1</title>
-      <param id="a1_prm1">
-         <label>A1 Parameter 1</label>
+      <param id="param-a1.a">
+         <label>a1.a parameter</label>
+         <value>a1.a value</value>
       </param>
-      <prop name="place" value="first"/>
+      <prop name="label" value="1st"/>
       <part name="statement" id="a1-stmt">
          <p>A1 aaaaa aaaaaaaaaa</p>
+         <p>Parameter A.a is set: <insert type="param" id-ref="param-A.a"/></p>
+         <p>Parameter a1.a is set: <insert type="param" id-ref="param-a1.a"/></p>
       </part>
    </control>
-   <control id="b1">
-      <title>Control B1</title>
-      <prop name="place" value="fourth"/>
-      <part name="statement" id="b1-stmt">
-         <p>B1 bbbb bbbbbbb.</p>
+   <control id="b2">
+      <title>Control B2</title>
+      <prop name="label" value="5th"/>
+      <link rel="citation" href="#4a3990e7-2020-4b8f-902c-d679ebea2b58"/>
+      <part name="statement" id="b2-stmt">
+         <p>B2 bbb bbbbbbbbbbb bbbbbbbbbbbb.</p>
+         <p>Also, we <a href="#4a3990e7-2020-4b8f-902c-d679ebea2b58">refer to a citation</a>.</p>
       </part>
    </control>
+   <back-matter>
+      <resource uuid="4a3990e7-2020-4b8f-902c-d679ebea2b58">
+         <citation>
+            <text>A citation to an out of line document.</text>
+         </citation>
+      </resource>
+      <resource uuid="70830fd9-7899-40f8-acfe-70a5d1a56353">
+      	 <prop name="keep" value="always"/>
+         <citation>
+            <text>A citation to an out of line document.</text>
+         </citation>
+      </resource>
+      <resource uuid="761205f0-fd61-42d3-9c66-2fb89e844a19">
+         <title>Risk Management Framework for Information Systems and Organizations: A System Life Cycle Approach for Security and Privacy</title>
+         <prop name="keep" value="always"/>
+         <document-id scheme="https://www.doi.org/">...doi...</document-id>
+         <rlink href="https://csrc.nist.gov/publications/detail/sp/800-37/rev-2/final"/>
+      </resource>
+   </back-matter>
 </catalog>
diff --git a/src/specifications/profile-resolution/profile-resolution-examples/output-expected/merge-keep_profile_RESOLVED.xml b/src/specifications/profile-resolution/profile-resolution-examples/output-expected/merge-keep_profile_RESOLVED.xml
index f2c4327c0d..232cef0234 100644
--- a/src/specifications/profile-resolution/profile-resolution-examples/output-expected/merge-keep_profile_RESOLVED.xml
+++ b/src/specifications/profile-resolution/profile-resolution-examples/output-expected/merge-keep_profile_RESOLVED.xml
@@ -6,7 +6,8 @@
       <last-modified>2021-04-06T15:00:53.459-04:00</last-modified>
       <version>1.0</version>
       <oscal-version>1.0.0</oscal-version>
-      <link rel="resolution-source" href="merge-keep_profile.xml"/>
+      <prop name="resolution-tool" value="some value"/>
+      <link rel="source-profile" href="../merge-keep_profile.xml"/>
    </metadata>
    <control id="a1">
       <title>Control A1</title>
diff --git a/src/specifications/profile-resolution/profile-resolution-examples/output-expected/modify-adds_profile_RESOLVED.xml b/src/specifications/profile-resolution/profile-resolution-examples/output-expected/modify-adds_profile_RESOLVED.xml
index 10f629276b..c331b3d7c4 100644
--- a/src/specifications/profile-resolution/profile-resolution-examples/output-expected/modify-adds_profile_RESOLVED.xml
+++ b/src/specifications/profile-resolution/profile-resolution-examples/output-expected/modify-adds_profile_RESOLVED.xml
@@ -6,7 +6,8 @@
       <last-modified>2021-04-06T15:00:53.695-04:00</last-modified>
       <version>1.2</version>
       <oscal-version>1.0.0</oscal-version>
-      <link rel="resolution-source" href="modify-adds_profile.xml"/>
+      <prop name="resolution-tool" value="some value"/>
+      <link rel="source-profile" href="../modify-adds_profile.xml"/>
    </metadata>
    <group>
       <title>Group A of C</title>